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

[nvidia-ci] drop DIST suffix when looking up image tags

Author: tariq1890

.common-ci.yml

@@ -68,17 +68,6 @@ trigger-pipeline:
       allow_failure: false
     - when: always
 
-# The .dist- dummy steps set the DIST variable for the targeted distribution.
-.dist-ubi9:
-  variables:
-    DIST: "ubi9"
-    CVE_UPDATES: "cyrus-sasl-lib"
-
-.dist-ubuntu20.04:
-  variables:
-    DIST: "ubuntu20.04"
-    CVE_UPDATES: "libsasl2-2 libsasl2-modules-db"
-
 # Define the platform targets
 .platform-amd64:
   variables:
@@ -108,7 +97,7 @@ trigger-pipeline:
 .scan-base:
   stage: scan
   variables:
-    IMAGE: "${CI_REGISTRY_IMAGE}/k8s-mig-manager:${CI_COMMIT_SHORT_SHA}-${DIST}"
+    IMAGE: "${CI_REGISTRY_IMAGE}/k8s-mig-manager:${CI_COMMIT_SHORT_SHA}"
     IMAGE_ARCHIVE: "k8s-mig-manager.tar"
   except:
     variables:
@@ -127,44 +116,25 @@ trigger-pipeline:
     - .scan-base
 
 # Define the scan targets
-scan-ubuntu20.04-amd64:
-  extends:
-    - .scan
-    - .dist-ubuntu20.04
-    - .platform-amd64
-  needs:
-    - image-ubuntu20.04
-
-scan-ubuntu20.04-arm64:
+scan-image-amd64:
   extends:
     - .scan
-    - .dist-ubuntu20.04
-    - .platform-arm64
-  needs:
-    - image-ubuntu20.04
-    - scan-ubuntu20.04-amd64
-
-scan-ubi9-amd64:
-  extends:
-    - .scan
-    - .dist-ubi9
     - .platform-amd64
   needs:
-    - image-ubi9
+    - image-distroless
 
-scan-ubi9-arm64:
+scan-image-arm64:
   extends:
     - .scan
-    - .dist-ubi9
     - .platform-arm64
   needs:
-    - image-ubi9
-    - scan-ubi9-amd64
+    - image-distroless
+    - scan-image-amd64
 
 # Download the regctl binary for use in the release steps
 .regctl-setup:
   before_script:
-    - export REGCTL_VERSION=v0.3.10
+    - export REGCTL_VERSION=v0.9.2
     - apk add --no-cache curl
     - mkdir -p bin
     - curl -sSLo bin/regctl https://github.com/regclient/regclient/releases/download/${REGCTL_VERSION}/regctl-linux-amd64
@@ -201,7 +171,7 @@ scan-ubi9-arm64:
 
     # Since OUT_IMAGE_NAME and OUT_IMAGE_VERSION are set, this will push the CI image to the
     # Target
-    - make -f deployments/container/Makefile push-${DIST}
+    - make -f deployments/container/Makefile push-image
 
 # Define a staging release step that pushes an image to an internal "staging" repository
 # This is triggered for all pipelines (i.e. not only tags) to test the pipeline steps
@@ -215,16 +185,8 @@ scan-ubi9-arm64:
     OUT_REGISTRY: "${NGC_REGISTRY}"
     OUT_IMAGE_NAME: "${NGC_STAGING_REGISTRY}/k8s-mig-manager"
 
-release:staging-ubi9:
-  extends:
-    - .release:staging
-    - .dist-ubi9
-  needs:
-    - image-ubi9
-
-release:staging-ubuntu20.04:
+release:staging:
   extends:
     - .release:staging
-    - .dist-ubuntu20.04
   needs:
-    - image-ubuntu20.04
+    - image-distroless

.gitlab-ci.yml

@@ -29,7 +29,7 @@ include:
     - 'echo "Logging in to CI registry ${CI_REGISTRY}"'
     - docker login -u "${CI_REGISTRY_USER}" -p "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
   script:
-    - make -f deployments/container/Makefile build-${DIST}
+    - make -f deployments/container/Makefile build-image
   needs:
     - trigger-pipeline
 

.nvidia-ci.yml

@@ -60,20 +60,14 @@ variables:
     - !reference [.regctl-setup, before_script]
     - apk add --no-cache make bash
     - >
-      regctl manifest get ${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION}-${DIST} --list > /dev/null && echo "${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION}-${DIST}" || ( echo "${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION}-${DIST} does not exist" && sleep infinity )
+      regctl manifest get ${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION} --list > /dev/null && echo "${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION}" || ( echo "${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION} does not exist" && sleep infinity )
   script:
     - regctl registry login "${OUT_REGISTRY}" -u "${OUT_REGISTRY_USER}" -p "${OUT_REGISTRY_TOKEN}"
-    - make -f deployments/container/Makefile IMAGE=${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION}-${DIST} OUT_IMAGE=${OUT_IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}-${DIST} push-${DIST}
+    - make -f deployments/container/Makefile IMAGE=${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION} OUT_IMAGE=${OUT_IMAGE_NAME}:${CI_COMMIT_SHORT_SHA} push-image
 
-image-ubi9:
+image-distroless:
   extends:
     - .image-pull
-    - .dist-ubi9
-
-image-ubuntu20.04:
-  extends:
-    - .image-pull
-    - .dist-ubuntu20.04
 
 # We skip the integration tests for the internal CI:
 .integration:
@@ -118,8 +112,7 @@ image-ubuntu20.04:
 .update-nspect:
   stage: ngc-publish
   needs:
-    - job: release:staging-ubi9
-    - job: release:staging-ubuntu20.04
+    - job: release:staging
   extends:
     - .ngc-publish-variables
   image: