From d502c9b7a67c0191bbeaa0758002c245dd01c3a7 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Thu, 24 Apr 2025 13:16:48 +0200 Subject: [PATCH 1/2] fix: add missing workflow modifications --- .github/workflows/smoke-test.yaml | 20 ++++++++++---------- chart/infra-server/static/workflow-aks.yaml | 6 ++++++ chart/infra-server/static/workflow-eks.yaml | 6 ++++++ 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.github/workflows/smoke-test.yaml b/.github/workflows/smoke-test.yaml index 21ec6a62c..777defb17 100644 --- a/.github/workflows/smoke-test.yaml +++ b/.github/workflows/smoke-test.yaml @@ -37,18 +37,18 @@ jobs: strategy: matrix: flavors: [ - {name: "demo", "args": "", "uniqueness": "a"}, - {name: "aks", "args": "", "uniqueness": "b"}, - {name: "aro", "args": "", "uniqueness": "c"}, - {name: "eks", "args": "user-arns=arn:aws:iam::393282794030:user/joey@stackrox.com", "uniqueness": "d"}, - {name: "gke", "args": "", "uniqueness": "e"}, - {name: "ibmroks", "args": "", "uniqueness": "f"}, - {name: "ocp-4", "args": "", "uniqueness": "g"}, - {name: "ocp-4-demo", "args": "", "uniqueness": "h"}, - {name: "ocp-4-perf-scale", "args": "", "uniqueness": "i"}, + x{name: "demo", "args": "", "uniqueness": "a"}, + x{name: "aks", "args": "", "uniqueness": "b"}, + x{name: "aro", "args": "", "uniqueness": "c"}, + x{name: "eks", "args": "user-arns=arn:aws:iam::393282794030:user/joey@stackrox.com", "uniqueness": "d"}, # --> grep fails after deletion + x{name: "gke", "args": "", "uniqueness": "e"}, + x{name: "ibmroks", "args": "", "uniqueness": "f"}, + x{name: "ocp-4", "args": "", "uniqueness": "g"}, + x{name: "ocp-4-demo", "args": "", "uniqueness": "h"}, + x{name: "ocp-4-perf-scale", "args": "", "uniqueness": "i"}, {name: "osd-on-aws", "args": "", "uniqueness": "k"}, {name: "osd-on-gcp", "args": "", "uniqueness": "l"}, - {name: "qa-demo", "args": "main-image=quay.io/rhacs-eng/main:4.7.0", "uniqueness": "m"}, + x{name: "qa-demo", "args": "main-image=quay.io/rhacs-eng/main:4.7.0", "uniqueness": "m"}, {name: "rosa", "args": "", "uniqueness": "n"}, {name: "rosahcp", "args": "", "uniqueness": "o"}, ] diff --git a/chart/infra-server/static/workflow-aks.yaml b/chart/infra-server/static/workflow-aks.yaml index 1b99c1d8b..e84315977 100644 --- a/chart/infra-server/static/workflow-aks.yaml +++ b/chart/infra-server/static/workflow-aks.yaml @@ -128,3 +128,9 @@ spec: secretKeyRef: name: azure-secrets key: AZURE_SP_TENANT + volumeMounts: + - name: data + mountPath: /data + volumes: + - name: data + emptyDir: {} diff --git a/chart/infra-server/static/workflow-eks.yaml b/chart/infra-server/static/workflow-eks.yaml index acb4b88f4..805b00d39 100644 --- a/chart/infra-server/static/workflow-eks.yaml +++ b/chart/infra-server/static/workflow-eks.yaml @@ -108,3 +108,9 @@ spec: secretKeyRef: name: aws-access-secrets key: AWS_SECRET_ACCESS_KEY + volumeMounts: + - name: data + mountPath: /data + volumes: + - name: data + emptyDir: {} From 7d47e853946ddd087e158f38fb7e039e91ccd4ed Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Thu, 24 Apr 2025 13:17:25 +0200 Subject: [PATCH 2/2] undo change to smoke-test --- .github/workflows/smoke-test.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/smoke-test.yaml b/.github/workflows/smoke-test.yaml index 777defb17..21ec6a62c 100644 --- a/.github/workflows/smoke-test.yaml +++ b/.github/workflows/smoke-test.yaml @@ -37,18 +37,18 @@ jobs: strategy: matrix: flavors: [ - x{name: "demo", "args": "", "uniqueness": "a"}, - x{name: "aks", "args": "", "uniqueness": "b"}, - x{name: "aro", "args": "", "uniqueness": "c"}, - x{name: "eks", "args": "user-arns=arn:aws:iam::393282794030:user/joey@stackrox.com", "uniqueness": "d"}, # --> grep fails after deletion - x{name: "gke", "args": "", "uniqueness": "e"}, - x{name: "ibmroks", "args": "", "uniqueness": "f"}, - x{name: "ocp-4", "args": "", "uniqueness": "g"}, - x{name: "ocp-4-demo", "args": "", "uniqueness": "h"}, - x{name: "ocp-4-perf-scale", "args": "", "uniqueness": "i"}, + {name: "demo", "args": "", "uniqueness": "a"}, + {name: "aks", "args": "", "uniqueness": "b"}, + {name: "aro", "args": "", "uniqueness": "c"}, + {name: "eks", "args": "user-arns=arn:aws:iam::393282794030:user/joey@stackrox.com", "uniqueness": "d"}, + {name: "gke", "args": "", "uniqueness": "e"}, + {name: "ibmroks", "args": "", "uniqueness": "f"}, + {name: "ocp-4", "args": "", "uniqueness": "g"}, + {name: "ocp-4-demo", "args": "", "uniqueness": "h"}, + {name: "ocp-4-perf-scale", "args": "", "uniqueness": "i"}, {name: "osd-on-aws", "args": "", "uniqueness": "k"}, {name: "osd-on-gcp", "args": "", "uniqueness": "l"}, - x{name: "qa-demo", "args": "main-image=quay.io/rhacs-eng/main:4.7.0", "uniqueness": "m"}, + {name: "qa-demo", "args": "main-image=quay.io/rhacs-eng/main:4.7.0", "uniqueness": "m"}, {name: "rosa", "args": "", "uniqueness": "n"}, {name: "rosahcp", "args": "", "uniqueness": "o"}, ]