Skip to content
Snippets Groups Projects
Commit d26d7f41 authored by Eesaan Atluri's avatar Eesaan Atluri
Browse files

feat: Define external repo dir using var

Parse the target dir where the external repo will be cloned, from the
value of EXT_REPO_DIR var. Use this var to replace all instances where
the repo name is hardcoded.
parent 02586d38
No related branches found
No related tags found
2 merge requests!3Change compute reference to login,!2feat(ssh_host_keys): add role for managing SSH host keys
...@@ -43,13 +43,14 @@ workflow: ...@@ -43,13 +43,14 @@ workflow:
.update_ansible_repo: &update_ansible_repo .update_ansible_repo: &update_ansible_repo
- *get_build_date - *get_build_date
- | - |
if [ ! -d $CI_PROJECT_DIR/CRI_XCBC ]; then export EXT_REPO_DIR=$(basename -s .git $EXT_PR_TARGET_REPO)
cd CRI_XCBC if [ ! -d $CI_PROJECT_DIR/$EXT_REPO_DIR ]; then
git clone ${EXT_PR_TARGET_REPO} ${EXT_REPO_DIR} git clone ${EXT_PR_TARGET_REPO} ${EXT_REPO_DIR}
cd ${EXT_REPO_DIR}
git remote add upstream ${EXT_PR_SRC_REPO} git remote add upstream ${EXT_PR_SRC_REPO}
cd .. cd ..
fi fi
- cd CRI_XCBC - cd ${EXT_REPO_DIR}
- git config user.name "${GIT_AUTHOR_NAME}" - git config user.name "${GIT_AUTHOR_NAME}"
- git config user.email "${GIT_AUTHOR_EMAIL}" - git config user.email "${GIT_AUTHOR_EMAIL}"
- git checkout ${EXT_PR_TARGET_BRANCH} - git checkout ${EXT_PR_TARGET_BRANCH}
...@@ -88,14 +89,14 @@ workflow: ...@@ -88,14 +89,14 @@ workflow:
# Ansible var overrides # Ansible var overrides
- | - |
if [ -n "${PROXY_ENABLE_VAR}" ]; then if [ -n "${PROXY_ENABLE_VAR}" ]; then
sed -i -E "s/(${PROXY_ENABLE_VAR}: ).*/\1true/" CRI_XCBC/group_vars/all sed -i -E "s/(${PROXY_ENABLE_VAR}: ).*/\1true/" $EXT_REPO_DIR/group_vars/all
fi fi
- 'sed -i -E "s|(s3_endpoint: ).*|\1\"${S3_ENDPOINT}\"|" CRI_XCBC/group_vars/all' - 'sed -i -E "s|(s3_endpoint: ).*|\1\"${S3_ENDPOINT}\"|" $EXT_REPO_DIR/group_vars/all'
- 'sed -i -E "s/(lts_access_key: ).*/\1\"${AWS_ACCESS_KEY_ID}\"/" CRI_XCBC/group_vars/all' - 'sed -i -E "s/(lts_access_key: ).*/\1\"${AWS_ACCESS_KEY_ID}\"/" $EXT_REPO_DIR/group_vars/all'
- 'sed -i -E "s/(lts_secret_key: ).*/\1\"${AWS_SECRET_ACCESS_KEY}\"/" CRI_XCBC/group_vars/all' - 'sed -i -E "s/(lts_secret_key: ).*/\1\"${AWS_SECRET_ACCESS_KEY}\"/" $EXT_REPO_DIR/group_vars/all'
- 'sed -i -E "s/(s3_shibboleth_bucket_name: ).*/\1\"${S3_SHIBBOLETH_BUCKET_NAME}\"/" CRI_XCBC/group_vars/all' - 'sed -i -E "s/(s3_shibboleth_bucket_name: ).*/\1\"${S3_SHIBBOLETH_BUCKET_NAME}\"/" $EXT_REPO_DIR/group_vars/all'
- 'sed -i -E "s/(s3_shibboleth_object_name: ).*/\1\"${S3_SHIBBOLETH_OBJECT_NAME}\"/" CRI_XCBC/group_vars/all' - 'sed -i -E "s/(s3_shibboleth_object_name: ).*/\1\"${S3_SHIBBOLETH_OBJECT_NAME}\"/" $EXT_REPO_DIR/group_vars/all'
- 'sed -i -E "s|(ssh_pub_key: ).*|\1\"{{ lookup(''file'', ''${SSH_PUB_KEY}'') }}\"|" CRI_XCBC/group_vars/all' - 'sed -i -E "s|(ssh_pub_key: ).*|\1\"{{ lookup(''file'', ''${SSH_PUB_KEY}'') }}\"|" $EXT_REPO_DIR/group_vars/all'
# packer commands # packer commands
- packer init openstack-proxy - packer init openstack-proxy
- packer validate openstack-proxy - packer validate openstack-proxy
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment