diff --git a/.github/actions/integration-test/action.yaml b/.github/actions/integration-test/action.yaml index 252c1604f..9d0712deb 100644 --- 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 index bf440e9cf..0ed0013fa 100644 --- 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 index 35df9c9f9..f49f0cd64 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -27,7 +27,7 @@ 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 @@ -35,9 +35,16 @@ jobs: - 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 }} \ No newline at end of file