Skip to content
Snippets Groups Projects
Commit a20de64a authored by Krish Moodbidri's avatar Krish Moodbidri
Browse files

changed compute built to be similar to proxy node builds

parent 823c8f0e
No related branches found
No related tags found
No related merge requests found
...@@ -110,15 +110,13 @@ workflow: ...@@ -110,15 +110,13 @@ workflow:
reports: reports:
dotenv: image.env dotenv: image.env
build_compute_image: .build_compute_image_template: &build_compute_image_template
stage: build
tags:
- build
script: script:
- *update_ansible_repo - *update_ansible_repo
- *get_ansible_files - *get_ansible_files
- export PKR_VAR_flavor="${COMPUTE_BUILD_FLAVOR:-$PKR_VAR_flavor}" # packer vars for job env
- export PKR_VAR_build_instance_name="${BUILD_TARGET}-${CRI_XCBC_HEAD}" - export PKR_VAR_flavor="${PROXY_BUILD_FLAVOR:-$PKR_VAR_flavor}"
- export PKR_VAR_build_instance_name="${BUILD_TARGET}-${EXT_REPO_HEAD}"
- export PKR_VAR_image_date_suffix=false - export PKR_VAR_image_date_suffix=false
- | - |
if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
...@@ -126,18 +124,34 @@ build_compute_image: ...@@ -126,18 +124,34 @@ build_compute_image:
elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then
export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}" export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}"
fi fi
# Ansible var overrides
- |
# packer commands # packer commands
- packer init openstack-compute - packer init openstack-proxy
- packer validate openstack-compute - packer validate openstack-proxy
- packer build -machine-readable openstack-compute | tee compute_build.log - packer build -machine-readable openstack-proxy | tee proxy_build.log
- export BUILT_COMPUTE_IMAGE_ID=$(grep 'Image:' compute_build.log | awk '{print $4}') - export BUILT_COMPUTE_IMAGE_ID=$(grep 'Image:' proxy_build.log | awk '{print $4}')
- echo BUILT_COMPUTE_IMAGE_ID=${BUILT_COMPUTE_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env - echo BUILT_COMPUTE_IMAGE_ID=${BUILT_COMPUTE_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env
- openstack image set --property CRI_XCBC_prod=${CRI_XCBC_prod} --property CRI_XCBC_dev=${CRI_XCBC_dev} --property PACKER_IMAGE_HEAD=${PACKER_IMAGE_HEAD} ${BUILT_COMPUTE_IMAGE_ID} # set image properties with repo state
- openstack image set --property EXT_PR_SRC_REPO=${EXT_PR_SRC_REPO} --property EXT_PR_SRC_BRANCH_SHA=${EXT_PR_SRC_BRANCH_SHA} --property EXT_PR_TARGET_REPO=${EXT_PR_TARGET_REPO} --property EXT_PR_TARGET_BRANCH_SHA=${EXT_PR_TARGET_BRANCH_SHA} --property PACKER_IMAGE_HEAD=${PACKER_IMAGE_HEAD} ${BUILT_COMPUTE_IMAGE_ID}
artifacts:
reports:
dotenv: image.env
build_compute_image:
stage: build
environment:
name: $ENV
tags:
- build
variables:
PROXY_ENABLE_VAR: "enable_compute"
<<: *build_compute_image_template
rules: rules:
- if: $PIPELINE_TARGET == "build" - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "http-proxy"
when: always when: always
build_http_proxy_image: build_http_proxy_image:
stage: build stage: build
environment: environment:
......
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