diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 431071ae10ea8de021ce3315a1f5d3777f5d08b7..208b185969664aa7223566d9fef0d7909308830c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,6 @@ variables: PKR_VAR_skip_create_image: "false" PKR_VAR_ssh_username: "centos" PKR_VAR_networks: '["7ac7d980-20bc-4e53-8528-6809e139fdcc"]' - PKR_VAR_build_instance_name: "ood-${CI_COMMIT_SHORT_SHA}" GIT_AUTHOR_NAME: "Gitlab runner" GIT_AUTHOR_EMAIL: "gitlab@runner" @@ -61,9 +60,13 @@ setup_environment: - git merge origin/uab-prod - git checkout -b integration - git merge upstream/dev + - echo "CRI_XCBC_HEAD=$(git rev-parse --short HEAD)" >> $CI_PROJECT_DIR/build.env - cd .. - s3cmd get --force --host=$AWS_HOST --host-bucket=$AWS_HOST s3://ood-config/group_vars/all CRI_XCBC/group_vars/prod - s3cmd get --force -r --host=$AWS_HOST --host-bucket=$AWS_HOST s3://cheaha-cloud-ansible-files/ ansible/files/ + artifacts: + reports: + dotenv: build.env build_image: stage: build @@ -74,7 +77,11 @@ build_image: script: - source venv/bin/activate - $CI_PROJECT_DIR/bin/packer validate openstack-ood - - PKR_VAR_image_date_suffix=true PKR_VAR_image_name=ood $CI_PROJECT_DIR/bin/packer build openstack-ood + - > + PKR_VAR_build_instance_name="ood-${CRI_XCBC_HEAD}" + PKR_VAR_image_date_suffix=true + PKR_VAR_image_name=ood + $CI_PROJECT_DIR/bin/packer build openstack-ood cleanup: when: always