ci: parallelize upgrade e2e test

Signed-off-by: Moritz Sanft <[email protected]>
edgelesssys · Jan 16, 2024 · 03e9197 · 03e9197
1 parent 2d3996d
commit 03e9197
Show file tree

Hide file tree

Showing 11 changed files with 243 additions and 52 deletions.
diff --git a/.github/actions/artifact_download/action.yml b/.github/actions/artifact_download/action.yml
@@ -9,7 +9,7 @@ inputs:
     description: 'Download to a specified path.'
     required: false
     default: ./
-  encryptionSecret:
+  encryption-secret:
     description: 'The secret to use for decrypting the artifact.'
     required: true
 
@@ -37,4 +37,4 @@ runs:
       shell: bash
       run: |
         mkdir -p ${{ inputs.path }}
-        unzip -P '${{ inputs.encryptionSecret }}' -qq -d ${{ inputs.path }} ${{ steps.tempdir.outputs.directory }}/archive.zip
+        unzip -P '${{ inputs.encryption-secret }}' -qq -d ${{ inputs.path }} ${{ steps.tempdir.outputs.directory }}/archive.zip
diff --git a/.github/actions/artifact_upload/action.yml b/.github/actions/artifact_upload/action.yml
@@ -11,7 +11,7 @@ inputs:
   retention-days:
     description: 'How long the artifact should be retained for.'
     default: 60
-  encryptionSecret:
+  encryption-secret:
     description: 'The secret to use for encrypting the files.'
     required: true
 
@@ -58,7 +58,7 @@ runs:
         for target in ${paths}
         do
           pushd "$(dirname "${target}")" || exit 1
-          zip -e -P '${{ inputs.encryptionSecret }}' -r "${{ steps.tempdir.outputs.directory }}/archive.zip" "$(basename "${target}")"
+          zip -e -P '${{ inputs.encryption-secret }}' -r "${{ steps.tempdir.outputs.directory }}/archive.zip" "$(basename "${target}")"
           popd || exit 1
         done
 

diff --git a/.github/actions/constellation_create/action.yml b/.github/actions/constellation_create/action.yml
@@ -59,7 +59,7 @@ inputs:
   force:
     description: "Set the force-flag on apply to ignore version mismatches."
     required: false
-  encryptionSecret:
+  encryption-secret:
     description: "The secret to use for encrypting the artifact."
     required: true
 
@@ -274,4 +274,4 @@ runs:
         name: serial-logs-${{ inputs.artifactNameSuffix }}
         path: >
           !(terraform).log
-        encryptionSecret: ${{ inputs.encryptionSecret }}
+        encryption-secret: ${{ inputs.encryption-secret }}
diff --git a/.github/actions/e2e_benchmark/action.yml b/.github/actions/e2e_benchmark/action.yml
@@ -17,7 +17,7 @@ inputs:
   awsOpenSearchPwd:
     description: "AWS OpenSearch Password to upload the results."
     required: false
-  encryptionSecret:
+  encryption-secret:
     description: 'The secret to use for encrypting the artifact.'
     required: true
 
@@ -100,7 +100,7 @@ runs:
       with:
         path: "out/fio-constellation-${{ inputs.cloudProvider }}.json"
         name: "fio-constellation-${{ inputs.cloudProvider }}.json"
-        encryptionSecret: ${{ inputs.encryptionSecret }}
+        encryption-secret: ${{ inputs.encryption-secret }}
 
     - name: Run knb benchmark
       shell: bash
@@ -122,7 +122,7 @@ runs:
       with:
         path: "out/knb-constellation-${{ inputs.cloudProvider }}.json"
         name: "knb-constellation-${{ inputs.cloudProvider }}.json"
-        encryptionSecret: ${{ inputs.encryptionSecret }}
+        encryption-secret: ${{ inputs.encryption-secret }}
 
     - name: Assume AWS role to retrieve and update benchmarks in S3
       uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
@@ -176,7 +176,7 @@ runs:
         path: >
           benchmarks/constellation-${{ inputs.cloudProvider }}.json
         name: "benchmarks"
-        encryptionSecret: ${{ inputs.encryptionSecret }}
+        encryption-secret: ${{ inputs.encryption-secret }}
 
     - name: Upload benchmark results to opensearch
       if: (!env.ACT)

diff --git a/.github/actions/e2e_sonobuoy/action.yml b/.github/actions/e2e_sonobuoy/action.yml
@@ -11,7 +11,7 @@ inputs:
   kubeconfig:
     description: "The kubeconfig of the cluster to test."
     required: true
-  encryptionSecret:
+  encryption-secret:
     description: 'The secret to use for encrypting the artifact.'
     required: true
 
@@ -51,7 +51,7 @@ runs:
       with:
         name: "sonobuoy-logs-${{ inputs.artifactNameSuffix }}.tar.gz"
         path: "*_sonobuoy_*.tar.gz"
-        encryptionSecret: ${{ inputs.encryptionSecret }}
+        encryption-secret: ${{ inputs.encryption-secret }}
 
     # Only works on "sonobuoy full" tests (e2e plugin)
     - name: Extract test results

diff --git a/.github/actions/e2e_test/action.yml b/.github/actions/e2e_test/action.yml
@@ -86,7 +86,7 @@ inputs:
   force:
     description: "Set the force-flag on apply to ignore version mismatches."
     required: false
-  encryptionSecret:
+  encryption-secret:
     description: 'The secret to use for decrypting the artifact.'
     required: true
 
@@ -299,7 +299,7 @@ runs:
         clusterCreation: ${{ inputs.clusterCreation }}
         marketplaceImageVersion: ${{ inputs.marketplaceImageVersion }}
         force: ${{ inputs.force }}
-        encryptionSecret: ${{ inputs.encryptionSecret }}
+        encryption-secret: ${{ inputs.encryption-secret }}
 
     - name: Deploy log- and metrics-collection (Kubernetes)
       id: deploy-logcollection
@@ -334,7 +334,7 @@ runs:
         sonobuoyTestSuiteCmd: "--mode quick"
         kubeconfig: ${{ steps.constellation-create.outputs.kubeconfig }}
         artifactNameSuffix: ${{ steps.create-prefix.outputs.prefix }}
-        encryptionSecret: ${{ inputs.encryptionSecret }}
+        encryption-secret: ${{ inputs.encryption-secret }}
 
     - name: Run sonobuoy full test
       if: inputs.test == 'sonobuoy full'
@@ -344,7 +344,7 @@ runs:
         sonobuoyTestSuiteCmd: '--plugin e2e --plugin-env e2e.E2E_FOCUS="\[Conformance\]" --plugin-env e2e.E2E_SKIP="for service with type clusterIP|HostPort validates that there is no conflict between pods with same hostPort but different hostIP and protocol" --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-plugin.yaml --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-master-plugin.yaml'
         kubeconfig: ${{ steps.constellation-create.outputs.kubeconfig }}
         artifactNameSuffix: ${{ steps.create-prefix.outputs.prefix }}
-        encryptionSecret: ${{ inputs.encryptionSecret }}
+        encryption-secret: ${{ inputs.encryption-secret }}
 
     - name: Run autoscaling test
       if: inputs.test == 'autoscaling'
@@ -367,7 +367,7 @@ runs:
         awsOpenSearchDomain: ${{ inputs.awsOpenSearchDomain }}
         awsOpenSearchUsers: ${{ inputs.awsOpenSearchUsers }}
         awsOpenSearchPwd: ${{ inputs.awsOpenSearchPwd }}
-        encryptionSecret: ${{ inputs.encryptionSecret }}
+        encryption-secret: ${{ inputs.encryption-secret }}
 
     - name: Run constellation verify test
       if: inputs.test == 'verify'

diff --git a/.github/workflows/e2e-test-daily.yml b/.github/workflows/e2e-test-daily.yml
@@ -91,7 +91,7 @@ jobs:
           awsOpenSearchUsers: ${{ secrets.AWS_OPENSEARCH_USER }}
           awsOpenSearchPwd: ${{ secrets.AWS_OPENSEARCH_PWD }}
           clusterCreation: "cli"
-          encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }}
+          encryption-secret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }}
 
       - name: Always terminate cluster
         if: always()

diff --git a/.github/workflows/e2e-test-release.yml b/.github/workflows/e2e-test-release.yml
@@ -265,7 +265,7 @@ jobs:
           clusterCreation: ${{ matrix.clusterCreation }}
           s3AccessKey: ${{ secrets.AWS_ACCESS_KEY_ID_S3PROXY }}
           s3SecretKey: ${{ secrets.AWS_SECRET_ACCESS_KEY_S3PROXY }}
-          encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }}
+          encryption-secret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }}
 
       - name: Always terminate cluster
         if: always()

diff --git a/.github/workflows/e2e-test-weekly.yml b/.github/workflows/e2e-test-weekly.yml
@@ -305,7 +305,7 @@ jobs:
           clusterCreation: ${{ matrix.clusterCreation }}
           s3AccessKey: ${{ secrets.AWS_ACCESS_KEY_ID_S3PROXY }}
           s3SecretKey: ${{ secrets.AWS_SECRET_ACCESS_KEY_S3PROXY }}
-          encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }}
+          encryption-secret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }}
 
       - name: Always terminate cluster
         if: always()

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -246,7 +246,7 @@ jobs:
           s3SecretKey: ${{ secrets.AWS_SECRET_ACCESS_KEY_S3PROXY }}
           marketplaceImageVersion: ${{ inputs.marketplaceImageVersion }}
           force: ${{ inputs.force }}
-          encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }}
+          encryption-secret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }}
 
       - name: Always terminate cluster
         if: always()