Run pre-check cleanup also in GH actions (#680)

Signed-off-by: Martin Morgenstern <[email protected]>
SovereignCloudStack · Aug 5, 2024 · 57479ad · 57479ad
1 parent c462a7d
commit 57479ad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.github/workflows/scs-compliance-check-with-application-credential.yml b/.github/workflows/scs-compliance-check-with-application-credential.yml
@@ -32,6 +32,9 @@ jobs:
               auth:
                 application_credential_secret: ${{ secrets[inputs.secret_name] }}
           EOF
+      - name: "Clean up any lingering resources from previous run"
+        if: ${{ inputs.layer == 'iaas' && inputs.version == 'v4' }}
+        run: "cd /scs-compliance && ./cleanup.py -c ${{ inputs.cloud }} --prefix _scs-"
       - name: "Run scs-compliance-check"
         run: "cd /scs-compliance && ./scs-compliance-check.py scs-compatible-${{ inputs.layer }}.yaml --version ${{ inputs.version }} -o result.yaml -s ${{ inputs.cloud }} -a os_cloud=${{ inputs.cloud }}"
       - name: "Upload results"

diff --git a/.github/workflows/scs-compliance-check.yml b/.github/workflows/scs-compliance-check.yml
@@ -32,6 +32,9 @@ jobs:
               auth:
                 password: ${{ secrets[inputs.secret_name] }}
           EOF
+      - name: "Clean up any lingering resources from previous run"
+        if: ${{ inputs.layer == 'iaas' && inputs.version == 'v4' }}
+        run: "cd /scs-compliance && ./cleanup.py -c ${{ inputs.cloud }} --prefix _scs-"
       - name: "Run scs-compliance-check"
         run: "cd /scs-compliance && ./scs-compliance-check.py scs-compatible-${{ inputs.layer }}.yaml --version ${{ inputs.version }} -o result.yaml -s ${{ inputs.cloud }} -a os_cloud=${{ inputs.cloud }}"
       - name: "Upload results"