From 75c32efe03db9d011bb42d1d1c93edbc982b167f Mon Sep 17 00:00:00 2001
From: Tariq Ibrahim <tibrahim@nvidia.com>
Date: Tue, 27 Aug 2024 10:34:13 -0700
Subject: [PATCH] update base image to ubi9 cuda base

Signed-off-by: Tariq Ibrahim <tibrahim@nvidia.com>
---
 .common-ci.yml                                | 10 +++----
 .github/workflows/images.yaml                 |  2 +-
 .gitlab-ci.yml                                |  4 +--
 .nvidia-ci.yml                                | 28 +++++++++----------
 .../{Dockerfile.ubi8 => Dockerfile.ubi9}      |  4 +--
 deployments/container/Makefile                |  6 ++--
 6 files changed, 27 insertions(+), 27 deletions(-)
 rename deployments/container/{Dockerfile.ubi8 => Dockerfile.ubi9} (96%)

diff --git a/.common-ci.yml b/.common-ci.yml
index 497caddf..3953d469 100644
--- a/.common-ci.yml
+++ b/.common-ci.yml
@@ -29,9 +29,9 @@ stages:
   - sign
 
 # Define the distribution targets
-.dist-ubi8:
+.dist-ubi9:
   variables:
-    DIST: ubi8
+    DIST: ubi9
     CVE_UPDATES: "cyrus-sasl-lib"
 
 # Define the platform targets
@@ -138,9 +138,9 @@ stages:
         OUT_IMAGE_VERSION: "${DEVEL_RELEASE_IMAGE_VERSION}"
 
 # Define the release jobs
-release:staging-ubi8:
+release:staging-ubi9:
   extends:
     - .release:staging
-    - .dist-ubi8
+    - .dist-ubi9
   needs:
-    - image-ubi8
+    - image-ubi9
diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
index 7cc236ca..472c57f4 100644
--- a/.github/workflows/images.yaml
+++ b/.github/workflows/images.yaml
@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dist: [ubi8]
+        dist: [ubi9]
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ce297c9..f6a110d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ include:
   script:
     - make -f deployments/container/Makefile build-${DIST}
 
-image-ubi8:
+image-ubi9:
   extends:
     - .image-build
-    - .dist-ubi8
+    - .dist-ubi9
diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml
index 20207eda..3ca18ec1 100644
--- a/.nvidia-ci.yml
+++ b/.nvidia-ci.yml
@@ -65,10 +65,10 @@ variables:
     - 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}
 
-image-ubi8:
+image-ubi9:
   extends:
     - .image-pull
-    - .dist-ubi8
+    - .dist-ubi9
 
 # We skip the integration tests for the internal CI:
 .integration:
@@ -110,28 +110,28 @@ image-ubi8:
       - vulns.json
       - policy_evaluation.json
 
-# The .scan-ubi8 steps forms the base for all ubi8 image scans across supported architectures
-.scan-ubi8:
+# The .scan-ubi9 steps forms the base for all ubi9 image scans across supported architectures
+.scan-ubi9:
   extends:
     - .scan
-    - .dist-ubi8
+    - .dist-ubi9
   needs:
-    - image-ubi8
+    - image-ubi9
 
 # Define the scan targets
-scan-ubi8-amd64:
+scan-ubi9-amd64:
   extends:
-    - .scan-ubi8
+    - .scan-ubi9
     - .platform-amd64
 
-scan-ubi8-arm64:
+scan-ubi9-arm64:
   extends:
-    - .scan-ubi8
+    - .scan-ubi9
     - .platform-arm64
   # For now, run the scans sequentially to avoid any issues
   # when pulling the same tag, but different arch, on the gitlab runner
   needs:
-    - scan-ubi8-amd64
+    - scan-ubi9-amd64
 
 # Define the external release helpers
 .release:ngc:
@@ -144,10 +144,10 @@ scan-ubi8-arm64:
 
 # Define the external release targets
 # Release to NGC
-release:ngc-ubi8:
+release:ngc-ubi9:
   extends:
     - .release:ngc
-    - .dist-ubi8
+    - .dist-ubi9
 
 # Define the external image signing steps for NGC
 # Download the ngc cli binary for use in the sign steps
@@ -192,7 +192,7 @@ sign:ngc:
   parallel:
     matrix:
     - SIGN_JOB_NAME: [""]
-      DIST: ["CI_COMMIT_TAG", "ubi8"]
+      DIST: ["CI_COMMIT_TAG", "ubi9"]
   rules:
     - if: '$DIST == "CI_COMMIT_TAG"'
       variables:
diff --git a/deployments/container/Dockerfile.ubi8 b/deployments/container/Dockerfile.ubi9
similarity index 96%
rename from deployments/container/Dockerfile.ubi8
rename to deployments/container/Dockerfile.ubi9
index 61569612..cdd8f791 100644
--- a/deployments/container/Dockerfile.ubi8
+++ b/deployments/container/Dockerfile.ubi9
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM nvcr.io/nvidia/cuda:12.6.0-base-ubi8 AS build
+FROM nvcr.io/nvidia/cuda:12.6.0-base-ubi9 AS build
 
 WORKDIR /work
 
@@ -41,7 +41,7 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 
 RUN GOOS=linux go build -o nvdrain ./cmd/nvdrain
 
-FROM nvcr.io/nvidia/cuda:12.6.0-base-ubi8
+FROM nvcr.io/nvidia/cuda:12.6.0-base-ubi9
 
 ARG TARGETARCH
 
diff --git a/deployments/container/Makefile b/deployments/container/Makefile
index 024557fa..3e770d70 100644
--- a/deployments/container/Makefile
+++ b/deployments/container/Makefile
@@ -38,8 +38,8 @@ OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(DIST)
 OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
 
 ##### Public rules #####
-DISTRIBUTIONS := ubi8
-DEFAULT_PUSH_TARGET := ubi8
+DISTRIBUTIONS := ubi9
+DEFAULT_PUSH_TARGET := ubi9
 
 PUSH_TARGETS := $(patsubst %, push-%, $(DISTRIBUTIONS))
 BUILD_TARGETS := $(patsubst %, build-%, $(DISTRIBUTIONS))
@@ -72,7 +72,7 @@ build-%: DIST = $(*)
 build-%: DOCKERFILE_SUFFIX = $(*)
 build-%: DOCKERFILE = $(CURDIR)/deployments/container/Dockerfile.$(DOCKERFILE_SUFFIX)
 
-# Both ubi8 and build-ubi8 trigger a build of the relevant image
+# Both ubi9 and build-ubi9 trigger a build of the relevant image
 $(DISTRIBUTIONS): %: build-%
 $(BUILD_TARGETS): build-%:
 	DOCKER_BUILDKIT=1 \