Merge remote-tracking branch 'origin/mr/119' into test-individual-build

.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,11 +114,10 @@ build_http_proxy_image:
   tags:
     - build
   variables:
-    PROXY_NAME: "http-proxy"
     PROXY_ENABLE_VAR: "enable_ood_proxy"
   <<: *build_proxy_image_template
   rules:
-    - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET
+    - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "http-proxy"
       when: always
 
 build_ssh_proxy_image:
@@ -128,11 +127,10 @@ build_ssh_proxy_image:
   tags:
     - build
   variables:
-    PROXY_NAME: "ssh-proxy"
     PROXY_ENABLE_VAR: "enable_sshpiper"
   <<: *build_proxy_image_template
   rules:
-    - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET
+    - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "ssh-proxy"
       when: always
 
 deploy_http_proxy_node: