only run trivy scan on image bumps

bertiethorpe · bertiethorpe · commit a60dbf445aba · 2024-10-03T15:14:25.000Z
diff --git a/.github/workflows/trivyscan.yml b/.github/workflows/trivyscan.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - ci/nightly-builds
+    paths:
+      - 'environments/.stackhpc/terraform/cluster_image.json'
 
 jobs:
   scan:
diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json
@@ -0,0 +1,7 @@
+{
+    "cluster_image": {
+        "RL8": "openhpc-RL8-241003-1241-a256bce2",
+        "RL9": "openhpc-RL9-241003-1241-a256bce2",
+        "RL9-cuda": "openhpc-cuda-RL9-241003-1242-a256bce2"
+    }
+}
diff --git a/environments/.stackhpc/terraform/cluster_image.json b/environments/.stackhpc/terraform/cluster_image.json
diff --git a/environments/.stackhpc/terraform/main.tf b/environments/.stackhpc/terraform/main.tf
@@ -28,7 +28,6 @@ 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 = jsondecode(file("./cluster_image.json"))
 }
 
 variable "cluster_net" {}

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ variable "os_version" {`
`28`	`28`	`variable "cluster_image" {`
`29`	`29`	`description = "single image for all cluster nodes, keyed by os_version - a convenience for CI"`
`30`	`30`	`type = map(string)`
`31`		`- default = jsondecode(file("./cluster_image.json"))`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`variable "cluster_net" {}`