diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2349ecfcf2391c81fd7ca810992b31b72c998acf..da4bff730b20fc6f51ec48bf68dc30bc8dcef878 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -117,21 +117,15 @@ build_compute_image: script: - *update_ansible_repo - *get_ansible_files - - export PKR_VAR_source_image=${BUILT_BASE_IMAGE_ID} - - export REPO_HEAD=$(git rev-parse --short HEAD) - export PKR_VAR_flavor="${COMPUTE_BUILD_FLAVOR:-$PKR_VAR_flavor}" - - export PKR_VAR_build_instance_name="compute-${REPO_HEAD}" + - export PKR_VAR_build_instance_name="${BUILD_TARGET}-${COMPUTE_XCBC_HEAD}" - export PKR_VAR_image_date_suffix=false - | if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then - export PKR_VAR_image_name="compute-PR-${CI_MERGE_REQUEST_IID}" + export PKR_VAR_image_name="${BUILD_TARGET}-PR-${CI_MERGE_REQUEST_IID}" elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then - export PKR_VAR_image_name="compute-${BUILD_DATE}" + export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}" fi - - packer init openstack-compute - - packer validate openstack-compute - - packer build -machine-readable openstack-compute | tee compute_build.log - - | rules: - if: $PIPELINE_TARGET == "build"