Skip to content
Snippets Groups Projects
Commit f41b6793 authored by Eesaan Atluri's avatar Eesaan Atluri Committed by Krish Moodbidri
Browse files

Change compute reference to login in build

parent 82d1fb46
No related branches found
No related tags found
No related merge requests found
...@@ -134,7 +134,7 @@ build_ssh_proxy_image: ...@@ -134,7 +134,7 @@ build_ssh_proxy_image:
- if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "ssh-proxy" - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "ssh-proxy"
when: always when: always
.build_compute_image_template: &build_compute_image_template .build_login_image_template: &build_login_image_template
script: script:
- *update_ansible_repo - *update_ansible_repo
- *get_ansible_files - *get_ansible_files
...@@ -151,15 +151,14 @@ build_ssh_proxy_image: ...@@ -151,15 +151,14 @@ build_ssh_proxy_image:
# packer commands # packer commands
- packer init openstack-compute - packer init openstack-compute
- packer validate openstack-compute - packer validate openstack-compute
- packer build -machine-readable openstack-compute | tee compute_build.log - packer build -machine-readable openstack-compute | tee login_build.log
- export BUILT_COMPUTE_IMAGE_ID=$(grep 'Image:' compute_build.log | awk '{print $4}') - export BUILT_LOGIN_IMAGE_ID=$(grep 'Image:' login_build.log | awk '{print $4}')
- echo BUILT_COMPUTE_IMAGE_ID=${BUILT_COMPUTE_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env - echo BUILT_LOGIN_IMAGE_ID=${BUILT_LOGIN_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}
artifacts: artifacts:
reports: reports:
dotenv: image.env dotenv: image.env
build_compute_image: build_login_image:
stage: build stage: build
environment: environment:
name: $ENV name: $ENV
...@@ -167,9 +166,9 @@ build_compute_image: ...@@ -167,9 +166,9 @@ build_compute_image:
- build - build
variables: variables:
PROXY_ENABLE_VAR: "enable_compute" PROXY_ENABLE_VAR: "enable_compute"
<<: *build_compute_image_template <<: *build_login_image_template
rules: rules:
- if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "compute" - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "login"
when: always when: always
build_http_proxy_image: build_http_proxy_image:
......
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