diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 623ec22982ddb038c610e2cca5dd6a3ad3c4054f..deb266249563e918380d7710cc248346c2156464 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -188,15 +188,15 @@ build_ood_image: - export PKR_VAR_image_date_suffix=false - export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}" - | - if [ $ENV = 'knightly' || $ENV = 'prod' ]; then + if [ $ENV = 'knightly' ] || [ $ENV = 'prod' ]; then curl --header "PRIVATE-TOKEN: ${ANSIBLE_VAR_TOKEN}" \ "${CI_API_V4_URL}/projects/2836/repository/files/knightly/raw?ref=main" \ -o CRI_XCBC/group_vars/$ENV - 'sed -i -E "s/(lts_access_key: ).*/\1\"${AWS_ACCESS_KEY_ID}\"/" CRI_XCBC/group_vars/$ENV' - 'sed -i -E "s/(lts_secret_key: ).*/\1\"${AWS_SECRET_ACCESS_KEY}\"/" CRI_XCBC/group_vars/$ENV' - 'sed -i -E "s/(user_register_app_key: ).*/\1\"${SELF_REG_APP_KEY}\"/" CRI_XCBC/group_vars/$ENV' - 'sed -i -E "s/(celery_user_password: ).*/\1\"${CELERY_PASSWD}\"/" CRI_XCBC/group_vars/$ENV' - 'sed -i -E "s|(ssh_pub_key: ).*|\1\"{{ lookup(''file'', ''${SSH_PUB_KEY}'') }}\"|" CRI_XCBC/group_vars/$ENV' + sed -i -E "s/(lts_access_key: ).*/\1\"${AWS_ACCESS_KEY_ID}\"/" CRI_XCBC/group_vars/$ENV + sed -i -E "s/(lts_secret_key: ).*/\1\"${AWS_SECRET_ACCESS_KEY}\"/" CRI_XCBC/group_vars/$ENV + sed -i -E "s/(user_register_app_key: ).*/\1\"${SELF_REG_APP_KEY}\"/" CRI_XCBC/group_vars/$ENV + sed -i -E "s/(celery_user_password: ).*/\1\"${CELERY_PASSWD}\"/" CRI_XCBC/group_vars/$ENV + sed -i -E "s|(ssh_pub_key: ).*|\1\"{{ lookup('file', '${SSH_PUB_KEY}') }}\"|" CRI_XCBC/group_vars/$ENV fi # packer commands - packer init openstack-ood