From dfc09250ce55745e9a4f08e6008c3e0a09d78475 Mon Sep 17 00:00:00 2001
From: Bo-Chun Louis Chen <louistw@uab.edu>
Date: Wed, 6 Nov 2024 14:59:22 -0600
Subject: [PATCH] refactor: reuse BUILD_TARGET variable
---
.gitlab-ci.yml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2309e1f..3301d40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,13 +77,13 @@ workflow:
- *get_ansible_files
# packer vars for job env
- 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
- |
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
- export PKR_VAR_image_name="${PROXY_NAME}-${BUILD_DATE}"
+ export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}"
fi
# Ansible var overrides
- |
@@ -114,7 +114,6 @@ build_http_proxy_image:
tags:
- build
variables:
- PROXY_NAME: "http-proxy"
PROXY_ENABLE_VAR: "enable_ood_proxy"
<<: *build_proxy_image_template
rules:
@@ -128,7 +127,6 @@ build_ssh_proxy_image:
tags:
- build
variables:
- PROXY_NAME: "ssh-proxy"
PROXY_ENABLE_VAR: "enable_sshpiper"
<<: *build_proxy_image_template
rules:
--
GitLab