Skip to content
Snippets Groups Projects
Commit dfc09250 authored by Bo-Chun Chen's avatar Bo-Chun Chen
Browse files

refactor: reuse BUILD_TARGET variable

parent 9727aa22
No related branches found
No related tags found
2 merge requests!119Feat individual build,!117This MR merges the feat-hpc-factory branch, which was focused on building and deploying proxy images for the COD cluster.
...@@ -77,13 +77,13 @@ workflow: ...@@ -77,13 +77,13 @@ workflow:
- *get_ansible_files - *get_ansible_files
# packer vars for job env # packer vars for job env
- export PKR_VAR_flavor="${PROXY_BUILD_FLAVOR:-$PKR_VAR_flavor}" - export PKR_VAR_flavor="${PROXY_BUILD_FLAVOR:-$PKR_VAR_flavor}"
- export PKR_VAR_build_instance_name="${PROXY_NAME}-${CRI_XCBC_HEAD}" - export PKR_VAR_build_instance_name="${BUILD_TARGET}-${CRI_XCBC_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
export PKR_VAR_image_name="${PROXY_NAME}-PR-${CI_MERGE_REQUEST_IID}" export PKR_VAR_image_name="${BUILD_TARGET}-PR-${CI_MERGE_REQUEST_IID}"
elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then
export PKR_VAR_image_name="${PROXY_NAME}-${BUILD_DATE}" export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}"
fi fi
# Ansible var overrides # Ansible var overrides
- | - |
...@@ -114,7 +114,6 @@ build_http_proxy_image: ...@@ -114,7 +114,6 @@ build_http_proxy_image:
tags: tags:
- build - build
variables: variables:
PROXY_NAME: "http-proxy"
PROXY_ENABLE_VAR: "enable_ood_proxy" PROXY_ENABLE_VAR: "enable_ood_proxy"
<<: *build_proxy_image_template <<: *build_proxy_image_template
rules: rules:
...@@ -128,7 +127,6 @@ build_ssh_proxy_image: ...@@ -128,7 +127,6 @@ build_ssh_proxy_image:
tags: tags:
- build - build
variables: variables:
PROXY_NAME: "ssh-proxy"
PROXY_ENABLE_VAR: "enable_sshpiper" PROXY_ENABLE_VAR: "enable_sshpiper"
<<: *build_proxy_image_template <<: *build_proxy_image_template
rules: rules:
......
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