Merge pull request #253 from NVIDIA/fix-internal-precompiled-ci-jobs

Fix internal precompiled ci jobs

Author: cdesiniotis

.common-ci.yml

@@ -55,6 +55,12 @@ workflow:
     - if: $CI_PIPELINE_SOURCE != "schedule"
       when: manual
 
+.precompiled-rules:
+  # only execute precompiled jobs on scheduled pipelines
+  rules:
+    - if: $CI_PIPELINE_SOURCE != "schedule"
+      when: never
+
 trigger-pipeline:
   stage: trigger
   script:
@@ -312,6 +318,8 @@ release:staging-rhel8:
     # OUT_VERSION is overridden for external releases
     OUT_VERSION: "${CI_COMMIT_SHORT_SHA}"
     PRECOMPILED: "true"
+  rules:
+    - !reference [.precompiled-rules, rules]
   extends:
     - .release-generic
 

.nvidia-ci.yml

@@ -94,6 +94,7 @@ image-precompiled-ubuntu24.04:
     PRECOMPILED: "true"
     CVE_UPDATES: "curl libc6"
   rules:
+    - !reference [.precompiled-rules, rules]
     - when: delayed
       start_in: 30 minutes
   extends:
@@ -118,6 +119,7 @@ image-precompiled-ubuntu22.04:
     PRECOMPILED: "true"
     CVE_UPDATES: "curl libc6"
   rules:
+    - !reference [.precompiled-rules, rules]
     - when: delayed
       start_in: 30 minutes
   extends:
@@ -235,6 +237,7 @@ image-rhel8:
     - .scan-generic
   rules:
     - !reference [.scan-rules-common, rules]
+    - !reference [.precompiled-rules, rules]
     - when: always
 
 .scan-precompiled-ubuntu22.04:
@@ -247,6 +250,7 @@ image-rhel8:
     - .scan-generic
   rules:
     - !reference [.scan-rules-common, rules]
+    - !reference [.precompiled-rules, rules]
     - when: always
 
 # Define the scan targets
@@ -363,8 +367,7 @@ release:ngc-ubuntu24.04:
 #     - .release-generic
 #     - .release:ngc-variables
 #   rules:
-#     # Only run NGC release job on scheduled pipelines
-#     - if: $CI_PIPELINE_SOURCE == "schedule"
+#   - !reference [.precompiled-rules, rules]
 
 release:ngc-precompiled-ubuntu22.04:
   variables:
@@ -376,8 +379,7 @@ release:ngc-precompiled-ubuntu22.04:
     - .release-generic
     - .release:ngc-variables
   rules:
-    # Only run NGC release job on scheduled pipelines
-    - if: $CI_PIPELINE_SOURCE == "schedule"
+    - !reference [.precompiled-rules, rules]
 
 release:ngc-rhcos4.12:
   extends:

Makefile

@@ -90,11 +90,11 @@ pull-signed_ubuntu20.04%: DRIVER_TAG = $(DRIVER_BRANCH)
 
 pull-signed_ubuntu22.04%: DIST = ubuntu22.04
 pull-signed_ubuntu22.04%: DRIVER_TAG = $(DRIVER_BRANCH)
-pull-signed_ubuntu22.04%: IMAGE_TAG = $(if $(VERSION),$(VERSION)-)$(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
+pull-signed_ubuntu22.04%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
 
 pull-signed_ubuntu24.04%: DIST = ubuntu24.04
 pull-signed_ubuntu24.04%: DRIVER_TAG = $(DRIVER_BRANCH)
-pull-signed_ubuntu24.04%: IMAGE_TAG = $(if $(VERSION),$(VERSION)-)$(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
+pull-signed_ubuntu24.04%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
 
 PLATFORM ?= linux/amd64
 $(DRIVER_PULL_TARGETS): pull-%: