ci: allow e2e tests to be skipped and enable SBOM again

Author: aardbol

.github/workflows/release-app.yaml

@@ -7,6 +7,11 @@ on:
     paths:
       - deploy/helm/Chart.yaml
   workflow_dispatch:
+    inputs:
+      skip-e2e:
+        description: Skip e2e tests
+        type: boolean
+        default: false
 
 concurrency:
   group: ${{ github.workflow }}
@@ -59,15 +64,19 @@ jobs:
 
   e2e:
     needs: build-image
-    if: ${{ needs.detect.outputs.skip == 'false' }}
+    if: needs.detect.outputs.skip == 'false' && !inputs['skip-e2e']
     uses: ./.github/workflows/_reusable-e2e.yaml
     with:
       image_tag: ${{ github.sha }}
     secrets: inherit
 
   release:
     needs: [detect, build-image, e2e]
-    if: ${{ needs.detect.outputs.skip == 'false' }}
+    if: >-
+      always() &&
+      needs.detect.outputs.skip == 'false' &&
+      needs.build-image.result == 'success' &&
+      (needs.e2e.result == 'success' || needs.e2e.result == 'skipped')
     runs-on: ubuntu-24.04
     permissions:
       contents: write
@@ -102,19 +111,20 @@ jobs:
           DIGEST=$(oras resolve "$IMAGE")
           cosign sign --yes "${{ env.REGISTRY }}/${{ github.repository }}@${DIGEST}"
 
-      # - name: Generate SBOM
-      #   uses: anchore/sbom-action@e22c389904149dbc22b58101806040fa8d37a610 # v0.24.0
-      #   with:
-      #     image: ${{ env.REGISTRY }}/${{ github.repository }}:${{ needs.detect.outputs.app_version }}
-      #     format: spdx-json
-      #     output-file: sbom.spdx.json
-      #     upload-artifact: false
-      #     upload-release-assets: false
-
-      # - name: Attest SBOM
-      #   run: |
-      #     IMAGE="${{ env.REGISTRY }}/${{ github.repository }}:${{ needs.detect.outputs.app_version }}"
-      #     cosign attest --yes --type spdx --predicate sbom.spdx.json "$IMAGE"
+      - name: Generate SBOM
+        uses: anchore/sbom-action@e22c389904149dbc22b58101806040fa8d37a610 # v0.24.0
+        with:
+          image: ${{ env.REGISTRY }}/${{ github.repository }}:${{ needs.detect.outputs.app_version }}
+          format: spdx-json
+          output-file: sbom.spdx.json
+          upload-artifact: false
+          upload-release-assets: false
+
+      - name: Attest SBOM
+        run: |
+          IMAGE="${{ env.REGISTRY }}/${{ github.repository }}:${{ needs.detect.outputs.app_version }}"
+          DIGEST=$(oras resolve "$IMAGE")
+          cosign attest --yes --type spdxjson --predicate sbom.spdx.json "${{ env.REGISTRY }}/${{ github.repository }}@${DIGEST}"
 
       - name: Get release notes
         run: make release-notes TAG="${{ needs.detect.outputs.app_version }}" > .release_notes

.github/workflows/release-helm.yaml

@@ -11,6 +11,11 @@ on:
     paths:
       - deploy/helm/Chart.yaml
   workflow_dispatch:
+    inputs:
+      skip-e2e:
+        description: Skip e2e tests
+        type: boolean
+        default: false
 
 permissions:
   contents: read
@@ -61,7 +66,7 @@ jobs:
   # has been bumped as well. The release-app action will then run the E2E tests instead.
   e2e:
     needs: detect
-    if: ${{ needs.detect.outputs.skip == 'false' && needs.detect.outputs.app_version_bumped == 'false' }}
+    if: needs.detect.outputs.skip == 'false' && needs.detect.outputs.app_version_bumped == 'false' && !inputs['skip-e2e']
     uses: ./.github/workflows/_reusable-e2e.yaml
     secrets: inherit