fix: image loading for release workflow (#192)

Fixed the release workflow, so it actually can load the Connaisseur images from DockerHub.
sse-secure-systems · Jul 26, 2021 · 9a5e930 · 9a5e930
1 parent f680a67
commit 9a5e930
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/.github/actions/integration-test/action.yaml b/.github/actions/integration-test/action.yaml
@@ -7,11 +7,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Load Docker images
-      run: |
-        docker load -i ${GITHUB_SHA}_image.tar
-        docker load -i ${GITHUB_SHA}_hook.tar
-      shell: bash
     - name: Install yq and bash
       run: |
         sudo snap install yq

diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
@@ -170,6 +170,11 @@ jobs:
       - uses: actions/download-artifact@v2
         with:
           name: images
+      - name: Load Docker images
+        run: |
+          docker load -i ${GITHUB_SHA}_image.tar
+          docker load -i ${GITHUB_SHA}_hook.tar
+        shell: bash
       - uses: ./.github/actions/integration-test
         with:
           integration-test-script: ${{ matrix.integration-test-script }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -27,17 +27,24 @@ jobs:
     needs: [version-match]
     strategy:
       matrix:
-        integration-test-script: [ 'integration-test.sh', 'cosign-integration-test.sh' , 'namespaced-integration-test.sh' ]
+        integration-test-script: [ 'integration-test.sh', 'preconfig-integration-test.sh', 'cosign-integration-test.sh' , 'namespaced-integration-test.sh' ]
     services:
       alerting-endpoint:
         image: securesystemsengineering/alerting-endpoint
         ports:
           - 56243:56243
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
-        with:
-          name: images
+      - name: Install yq and bash
+        run: |
+          sudo snap install yq
+          sudo apt update
+          sudo apt install bash -y
+      - name: Load Docker images
+        run: |
+          DOCKER_CONTENT_TRUST=1 docker pull $(yq e '.deployment.image' helm/values.yaml)
+          DOCKER_CONTENT_TRUST=1 docker pull $(yq e '.deployment.helmHookImage' helm/values.yaml)
+        shell: bash
       - uses: ./.github/actions/integration-test
         with:
           integration-test-script: ${{ matrix.integration-test-script }}