From eab054a643579ef63ea3f4690f9f1da44b984d57 Mon Sep 17 00:00:00 2001
From: Tariq Ibrahim <tibrahim@nvidia.com>
Date: Thu, 5 Sep 2024 09:56:08 -0700
Subject: [PATCH] update matrix of supported distros

Signed-off-by: Tariq Ibrahim <tibrahim@nvidia.com>
---
 .github/workflows/image.yaml |  3 ---
 .nvidia-ci.yml               | 42 ++++++------------------------------
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
index 0aa960c0..04ef9932 100644
--- a/.github/workflows/image.yaml
+++ b/.github/workflows/image.yaml
@@ -42,12 +42,9 @@ jobs:
           - ubuntu22.04
           - rhel8
           - rhel9
-          - fedora36
         ispr:
           - ${{github.event_name == 'pull_request'}}
         exclude:
-          - ispr: true
-            dist: fedora36
           - ispr: true
             dist: rhel8
           - ispr: true
diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml
index 889e157e..4868ed30 100644
--- a/.nvidia-ci.yml
+++ b/.nvidia-ci.yml
@@ -315,27 +315,6 @@ release:ngc-precompiled-ubuntu22.04:
     # Only run NGC release job on scheduled pipelines
     - if: $CI_PIPELINE_SOURCE == "schedule"
 
-release:ngc-rhcos4.9:
-  extends:
-    - .release:ngc
-    - .dist-rhel8
-  variables:
-    OUT_DIST: "rhcos4.9"
-
-release:ngc-rhcos4.10:
-  extends:
-    - .release:ngc
-    - .dist-rhel8
-  variables:
-    OUT_DIST: "rhcos4.10"
-
-release:ngc-rhcos4.11:
-  extends:
-    - .release:ngc
-    - .dist-rhel8
-  variables:
-    OUT_DIST: "rhcos4.11"
-
 release:ngc-rhcos4.12:
   extends:
     - .release:ngc
@@ -364,19 +343,12 @@ release:ngc-rhcos4.15:
   variables:
     OUT_DIST: "rhcos4.15"
 
-release:ngc-rhel8.6:
-  extends:
-    - .release:ngc
-    - .dist-rhel8
-  variables:
-    OUT_DIST: "rhel8.6"
-
-release:ngc-rhel8.7:
+release:ngc-rhcos4.16:
   extends:
     - .release:ngc
     - .dist-rhel8
   variables:
-    OUT_DIST: "rhel8.7"
+    OUT_DIST: "rhcos4.16"
 
 release:ngc-rhel8.8:
   extends:
@@ -385,12 +357,12 @@ release:ngc-rhel8.8:
   variables:
     OUT_DIST: "rhel8.8"
 
-release:ngc-rhel8.9:
+release:ngc-rhel8.10:
   extends:
     - .release:ngc
     - .dist-rhel8
   variables:
-    OUT_DIST: "rhel8.9"
+    OUT_DIST: "rhel8.10"
 
 release:ngc-rhel9.0:
   extends:
@@ -425,7 +397,7 @@ release:ngc-rhel9.3:
 .ngccli-setup:
   before_script:
     - apt-get update && apt-get install -y curl unzip jq bash make
-    - export REGCTL_VERSION=v0.4.7
+    - export REGCTL_VERSION=v0.7.1
     - mkdir -p bin
     - curl -sSLo bin/regctl https://github.com/regclient/regclient/releases/download/${REGCTL_VERSION}/regctl-linux-amd64
     - chmod a+x bin/regctl
@@ -507,8 +479,8 @@ sign:ngc-ubuntu-rhel-rhcos:
       VERSION: ["20.04"]
       DRIVER_VERSION: ["535.183.06", "550.90.07", "560.35.03"]
     - SIGN_JOB_NAME: ["rhel"]
-      VERSION: ["8.6", "8.7", "8.8", "8.9","8.10"]
+      VERSION: ["8.8", "8.10"]
       DRIVER_VERSION: ["535.183.06", "550.90.07", "560.35.03"]
     - SIGN_JOB_NAME: ["rhcos"]
-      VERSION: ["4.9", "4.10", "4.11", "4.12","4.13","4.14","4.15"]
+      VERSION: ["4.12","4.13","4.14","4.15", "4.16"]
       DRIVER_VERSION: ["535.183.06", "550.90.07", "560.35.03"]