Skip to content
Snippets Groups Projects
Commit e3499e37 authored by Eesaan Atluri's avatar Eesaan Atluri
Browse files

Merge branch 'feat-individual-build' into 'feat-hpc-factory'

Feat individual build

See merge request !119
parents 438f100e dfc09250
No related branches found
No related tags found
1 merge request!3Change compute reference to login
...@@ -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,11 +114,10 @@ build_http_proxy_image: ...@@ -114,11 +114,10 @@ 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:
- if: $PIPELINE_TARGET == "build" && $BUILD_TARGET - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "http-proxy"
when: always when: always
build_ssh_proxy_image: build_ssh_proxy_image:
...@@ -128,11 +127,10 @@ build_ssh_proxy_image: ...@@ -128,11 +127,10 @@ 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:
- if: $PIPELINE_TARGET == "build" && $BUILD_TARGET - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "ssh-proxy"
when: always when: always
deploy_http_proxy_node: deploy_http_proxy_node:
......
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