bump image and test trivy scan

Author: bertiethorpe

.github/workflows/trivyscan.yml

@@ -8,37 +8,22 @@ on:
 jobs:
   scan:
     concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os_version }}-${{ matrix.build }} # to branch/PR + OS + build
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.build }} # to branch/PR + OS + build
       cancel-in-progress: true
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        os_version:
-          - RL8
-          - RL9
-        build:
-          - openstack.openhpc
-          - openstack.openhpc-cuda
-        exclude:
-          - os_version: RL8
-            build: openstack.openhpc-cuda
+        build: ["RL8", "RL9", "RL9-cuda"]
     env:
-      BUILD: ${{ matrix.build }}-${{ matrix.os_version }}
+      JSON_PATH: environments/.stackhpc/terraform/cluster_image.json
 
     steps:
-      - name: Download image details artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: image-details-${{ env.BUILD }}
-
-      - name: Use the downloaded artifact
-        id: manifest
+      - name: Parse image name json
+        id: mainfest
         run: |
-          IMAGE_ID=$(cat image-id.txt)
-          IMAGE_NAME=$(cat image-name.txt)
+          IMAGE_NAME=$(jq --arg version "${{ matrix.build }}" -r '.[$version]' "${{ env.JSON_PATH }}")
           echo "image-name=${IMAGE_NAME}" >> "$GITHUB_OUTPUT"
-          echo "image-id=${IMAGE_ID}" >> "$GITHUB_OUTPUT"
 
       - name: Download image
         run: |

environments/.stackhpc/terraform/cluster_image.json

@@ -0,0 +1,5 @@
+{
+    "RL8": "openhpc-RL8-241003-1241-a256bce2",
+    "RL9": "openhpc-RL9-241003-1241-a256bce2",
+    "RL9-cuda": "openhpc-cuda-RL9-241003-1242-a256bce2"
+}

environments/.stackhpc/terraform/main.tf

@@ -28,11 +28,7 @@ variable "os_version" {
 variable "cluster_image" {
     description = "single image for all cluster nodes, keyed by os_version - a convenience for CI"
     type = map(string)
-    default = {
-        # https://github.com/stackhpc/ansible-slurm-appliance/pull/427
-        RL8: "openhpc-RL8-241003-1122-348c1508"
-        RL9: "openhpc-RL9-241003-1122-348c1508"
-    }
+    default = jsondecode(file("./cluster_image.json"))
 }
 
 variable "cluster_net" {}