Merge branch 'main' into sbom_json_check

konflux-ci · Apr 5, 2024 · 007f2d6 · 007f2d6
2 parents b4917e1 + b174353
commit 007f2d6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.tekton/tasks/e2e-test.yaml b/.tekton/tasks/e2e-test.yaml
@@ -18,7 +18,7 @@ spec:
       type: string
   steps:
     - name: e2e-test
-      image: quay.io/redhat-appstudio/e2e-tests:4f0eeef4edf4559f11d576783aa6cc5101e44323
+      image: quay.io/redhat-appstudio/e2e-tests:aee2181831ab240041e83f1c9036532415f45ccf
       # a la infra-deployment updates, when PRs merge in e2e-tests, PRs will be opened
       # against build-definitions to update this tag
       args: [

diff --git a/task/buildah-remote/0.1/buildah-remote.yaml b/task/buildah-remote/0.1/buildah-remote.yaml
@@ -295,7 +295,7 @@ spec:
       done
 
       # Needed to generate base images SBOM
-      echo "$BASE_IMAGES" > /workspace/base_images_from_dockerfile
+      echo "$BASE_IMAGES" > $(workspaces.source.path)/base_images_from_dockerfile
 
       buildah push "$IMAGE" oci:rhtap-final-image
       REMOTESSHEOF
@@ -444,7 +444,7 @@ spec:
     image: quay.io/redhat-appstudio/base-images-sbom-script@sha256:667669e3def018f9dbb8eaf8868887a40bc07842221e9a98f6787edcff021840
     name: create-base-images-sbom
     script: |
-      python3 /app/base_images_sbom_script.py --sbom=sbom-cyclonedx.json --base-images-from-dockerfile=/workspace/base_images_from_dockerfile --base-images-digests=$BASE_IMAGES_DIGESTS_PATH
+      python3 /app/base_images_sbom_script.py --sbom=sbom-cyclonedx.json --base-images-from-dockerfile=base_images_from_dockerfile --base-images-digests=$BASE_IMAGES_DIGESTS_PATH
     securityContext:
       runAsUser: 0
     workingDir: $(workspaces.source.path)

diff --git a/task/buildah/0.1/buildah.yaml b/task/buildah/0.1/buildah.yaml
@@ -246,7 +246,7 @@ spec:
       done
 
       # Needed to generate base images SBOM
-      echo "$BASE_IMAGES" > /workspace/base_images_from_dockerfile
+      echo "$BASE_IMAGES" > $(workspaces.source.path)/base_images_from_dockerfile
 
     securityContext:
       capabilities:
@@ -359,7 +359,7 @@ spec:
     - name: BASE_IMAGES_DIGESTS_PATH
       value: $(results.BASE_IMAGES_DIGESTS.path)
     script: |
-      python3 /app/base_images_sbom_script.py --sbom=sbom-cyclonedx.json --base-images-from-dockerfile=/workspace/base_images_from_dockerfile --base-images-digests=$BASE_IMAGES_DIGESTS_PATH
+      python3 /app/base_images_sbom_script.py --sbom=sbom-cyclonedx.json --base-images-from-dockerfile=base_images_from_dockerfile --base-images-digests=$BASE_IMAGES_DIGESTS_PATH
     workingDir: $(workspaces.source.path)
     securityContext:
       runAsUser: 0