remove all reference to cuda/ofed in CI and packer config

Author: bertiethorpe

.github/workflows/fatimage.yml

@@ -15,17 +15,15 @@ jobs:
   openstack:
     name: openstack-imagebuild
     concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os_version }}-${{ matrix.build }} # to branch/PR + OS + build
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os_version }} # to branch/PR + OS
       cancel-in-progress: true
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false # allow other matrix jobs to continue even if one fails
-      matrix: # build RL8+OFED, RL9+OFED, RL9+OFED+CUDA versions
+      matrix: # build RL8, RL9
         os_version:
           - RL8
           - RL9
-        build:
-          - openstack.openhpc
     env:
       ANSIBLE_FORCE_COLOR: True
       OS_CLOUD: openstack
@@ -39,6 +37,7 @@ jobs:
             "openstack.openhpc": "rocky-latest-RL9"
           }
         }
+      BUILD: openstack.openhpc
 
     steps:
       - uses: actions/checkout@v2
@@ -84,13 +83,13 @@ jobs:
 
           PACKER_LOG=1 packer build \
           -on-error=${{ vars.PACKER_ON_ERROR }} \
-          -only=${{ matrix.build }} \
+          -only=${{ env.BUILD }} \
           -var-file=$PKR_VAR_environment_root/${{ env.CI_CLOUD }}.pkrvars.hcl \
           -var "source_image_name=${{ env.SOURCE_IMAGE }}" \
           openstack.pkr.hcl
         env:
           PKR_VAR_os_version: ${{ matrix.os_version }}
-          SOURCE_IMAGE: ${{ fromJSON(env.SOURCE_IMAGES_MAP)[matrix.os_version][matrix.build] }}
+          SOURCE_IMAGE: ${{ fromJSON(env.SOURCE_IMAGES_MAP)[matrix.os_version][env.BUILD] }}
 
       - name: Get created image names from manifest
         id: manifest
@@ -107,7 +106,7 @@ jobs:
       - name: Upload manifest artifact
         uses: actions/upload-artifact@v4
         with:
-          name: image-details-${{ matrix.build }}-${{ matrix.os_version }}
+          name: image-details-${{ env.BUILD }}-${{ matrix.os_version }}
           path: |
             ./image-id.txt
             ./image-name.txt

.github/workflows/nightlybuild.yml

@@ -17,17 +17,15 @@ jobs:
   openstack:
     name: openstack-imagebuild
     concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os_version }}-${{ matrix.build }} # to branch/PR + OS + build
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os_version }} # to branch/PR + OS
       cancel-in-progress: true
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false # allow other matrix jobs to continue even if one fails
-      matrix: # build RL8, RL9, RL9+CUDA versions
+      matrix: # build RL8, RL9
         os_version:
           - RL8
           - RL9
-        build:
-          - openstack.rocky-latest
     env:
       ANSIBLE_FORCE_COLOR: True
       OS_CLOUD: openstack
@@ -37,6 +35,7 @@ jobs:
           "RL8": "Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2",
           "RL9": "Rocky-9-GenericCloud-Base-9.4-20240523.0.x86_64.qcow2"
         }
+      BUILD: openstack.openhpc
 
     steps:
       - uses: actions/checkout@v2
@@ -82,7 +81,7 @@ jobs:
 
           PACKER_LOG=1 packer build \
           -on-error=${{ vars.PACKER_ON_ERROR }} \
-          -only=${{ matrix.build }} \
+          -only=${{ env.BUILD }} \
           -var-file=$PKR_VAR_environment_root/${{ env.CI_CLOUD }}.pkrvars.hcl \
           -var "source_image_name=${{ env.SOURCE_IMAGE }}" \
           openstack.pkr.hcl

.github/workflows/trivyscan.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   scan:
     concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.build }} # to branch/PR + OS + build
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.build }} # to branch/PR + build
       cancel-in-progress: true
     runs-on: ubuntu-latest
     strategy:
@@ -100,7 +100,7 @@ jobs:
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: "${{ steps.manifest.outputs.image-name }}.sarif"
-          category: "${{ matrix.os_version }}-${{ matrix.build }}"
+          category: "${{ matrix.build }}"
 
       - name: Fail if scan has CRITICAL vulnerabilities
         uses: aquasecurity/[email protected]

packer/openstack.pkr.hcl

@@ -127,15 +127,13 @@ variable "volume_size" {
   default = {
     # fat image builds, GB:
     rocky-latest = 15
-    rocky-latest-cuda = 30
     openhpc = 15
-    openhpc-cuda = 30
   }
 }
 
 variable "extra_build_volume_size" {
   type = number
-  default = 15 # same as default non-CUDA build
+  default = 15
 }
 
 variable "image_disk_format" {
@@ -154,9 +152,7 @@ variable "groups" {
   default = {
     # fat image builds:
     rocky-latest = ["update"]
-    rocky-latest-cuda = ["update", "cuda"]
     openhpc = ["control", "compute", "login"]
-    openhpc-cuda = ["control", "compute", "login"]
   }
 }
 
@@ -210,24 +206,12 @@ build {
     image_name = "${source.name}-${var.os_version}"
   }
 
-  # latest nightly cuda image:
-  source "source.openstack.openhpc" {
-    name = "rocky-latest-cuda"
-    image_name = "${source.name}-${var.os_version}"
-  }
-
-  # OFED fat image:
+  # fat image:
   source "source.openstack.openhpc" {
     name = "openhpc"
     image_name = "${source.name}-${var.os_version}-${local.timestamp}-${substr(local.git_commit, 0, 8)}"
   }
 
-  # CUDA fat image:
-  source "source.openstack.openhpc" {
-    name = "openhpc-cuda"
-    image_name = "${source.name}-${var.os_version}-${local.timestamp}-${substr(local.git_commit, 0, 8)}"
-  }
-
   # Extended site-specific image, built on fat image:
   source "source.openstack.openhpc" {
     name = "openhpc-extra"