Merge pull request #1096 from NVIDIA/nvidia-ci-fix

cleanup redundant sign:ngc jobs and fix bug in release:ngc job

Author: tariq1890

.nvidia-ci.yml

@@ -216,13 +216,6 @@ sign:ngc-gpu-operator:
   variables:
     IMAGE_TAG: "${CI_COMMIT_TAG}"
 
-sign:ngc-gpu-operator-ubi9:
-  extends:
-    - .sign:ngc
-    - .dist-ubi9
-  needs:
-    - release:ngc-gpu-operator
-
 sign:ngc-gpu-operator-validator:
   extends:
     - .sign:ngc
@@ -232,15 +225,6 @@ sign:ngc-gpu-operator-validator:
     IMAGE_NAME: "${NGC_PROD_VALIDATOR_IMAGE}"
     IMAGE_TAG: "${CI_COMMIT_TAG}"
 
-sign:ngc-gpu-operator-validator-ubi9:
-  extends:
-    - .sign:ngc
-    - .dist-ubi9
-  needs:
-    - release:ngc-gpu-operator-validator
-  variables:
-    IMAGE_NAME: "${NGC_PROD_VALIDATOR_IMAGE}"
-
 .schedule_defaults:
   rules:
   - if: $CI_PIPELINE_SOURCE == "schedule"

Makefile

@@ -37,7 +37,8 @@ IMAGE = $(IMAGE_NAME):$(IMAGE_TAG)
 BUILDIMAGE ?= $(IMAGE_NAME):$(IMAGE_TAG)-build
 
 OUT_IMAGE_NAME ?= $(IMAGE_NAME)
-OUT_IMAGE_TAG = $(VERSION)
+OUT_IMAGE_VERSION ?= $(VERSION)
+OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)
 OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
 
 # CHANNELS define the bundle channels used in the bundle.