diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db70c6e062f47f4f1e06fb5853fe842b031de00e..a0afa4c186ae0d555bd2cc78ff6ba233624413cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,6 +70,9 @@ workflow: - echo CRI_XCBC_prod=${CRI_XCBC_prod} | tee -a $CI_PROJECT_DIR/image.env - echo PACKER_IMAGE_HEAD=${PACKER_IMAGE_HEAD} | tee -a $CI_PROJECT_DIR/image.env +.get_ansible_files: &get_ansible_files + - s3cmd get --force -r --host=$AWS_HOST --host-bucket=$AWS_HOST s3://cheaha-cloud-ansible-files/ ansible/files/ + build_docker_image: image: docker:20.10.17 stage: pre-build @@ -171,11 +174,11 @@ build_ood_image: - build script: - *update_ansible_repo + - *get_ansible_files - > curl --header "PRIVATE-TOKEN: ${ANSIBLE_VAR_TOKEN}" "${CI_API_V4_URL}/projects/2836/repository/files/knightly/raw?ref=main" -o CRI_XCBC/group_vars/knightly - - s3cmd get --force -r --host=$AWS_HOST --host-bucket=$AWS_HOST s3://cheaha-cloud-ansible-files/ ansible/files/ - 'sed -i -E "s/(lts_access_key: ).*/\1\"${AWS_ACCESS_KEY_ID}\"/" CRI_XCBC/group_vars/knightly' - 'sed -i -E "s/(lts_secret_key: ).*/\1\"${AWS_SECRET_ACCESS_KEY}\"/" CRI_XCBC/group_vars/knightly' - 'sed -i -E "s/(user_register_app_key: ).*/\1\"${SELF_REG_APP_KEY}\"/" CRI_XCBC/group_vars/knightly'