From dc0b71828d6dbaaa437bf92bb651c64c4f21c4eb Mon Sep 17 00:00:00 2001 From: arewm Date: Wed, 28 Aug 2024 14:32:29 -0400 Subject: [PATCH] Revert "replace multi-platform-runner image with buildah" This reverts commit 79b11ef741cec77d707f5670315f7d7b68322d9c. This change broke the ostree tasks due to the updated buildah version. This updated version includes https://github.com/containers/common/commit/08fc0b450 which prevents the task from being able to use an OCI archive as desired. --- task/build-vm-image/0.1/build-vm-image.yaml | 2 +- task/rpm-ostree/0.1/rpm-ostree.yaml | 4 ++-- task/rpm-ostree/0.2/rpm-ostree.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/task/build-vm-image/0.1/build-vm-image.yaml b/task/build-vm-image/0.1/build-vm-image.yaml index b26e9c5fb4..17b3db27eb 100644 --- a/task/build-vm-image/0.1/build-vm-image.yaml +++ b/task/build-vm-image/0.1/build-vm-image.yaml @@ -113,7 +113,7 @@ spec: echo "declare TAGGED_AS=${TAGGED_AS}" >> /var/workdir/vars - name: build - image: quay.io/konflux-ci/buildah-task:latest@sha256:1301e1a87a44898ab73e5dff8f6ac7499be4cb64eb7300e25d7a20ae266c87d3 + image: quay.io/redhat-appstudio/multi-platform-runner:01c7670e81d5120347cf0ad13372742489985e5f@sha256:246adeaaba600e207131d63a7f706cffdcdc37d8f600c56187123ec62823ff44 computeResources: limits: memory: 512Mi diff --git a/task/rpm-ostree/0.1/rpm-ostree.yaml b/task/rpm-ostree/0.1/rpm-ostree.yaml index be7b5228b3..7d97ee1278 100644 --- a/task/rpm-ostree/0.1/rpm-ostree.yaml +++ b/task/rpm-ostree/0.1/rpm-ostree.yaml @@ -89,7 +89,7 @@ spec: - env: - name: COMMIT_SHA value: $(params.COMMIT_SHA) - image: quay.io/konflux-ci/buildah-task:latest@sha256:1301e1a87a44898ab73e5dff8f6ac7499be4cb64eb7300e25d7a20ae266c87d3 + image: quay.io/redhat-appstudio/multi-platform-runner:01c7670e81d5120347cf0ad13372742489985e5f@sha256:246adeaaba600e207131d63a7f706cffdcdc37d8f600c56187123ec62823ff44 # per https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting # the cluster will set imagePullPolicy to IfNotPresent name: build @@ -227,7 +227,7 @@ spec: workingDir: $(workspaces.source.path) securityContext: runAsUser: 0 - - image: quay.io/konflux-ci/buildah-task:latest@sha256:1301e1a87a44898ab73e5dff8f6ac7499be4cb64eb7300e25d7a20ae266c87d3 + - image: quay.io/redhat-appstudio/multi-platform-runner:01c7670e81d5120347cf0ad13372742489985e5f # per https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting # the cluster will set imagePullPolicy to IfNotPresent name: inject-sbom-and-push diff --git a/task/rpm-ostree/0.2/rpm-ostree.yaml b/task/rpm-ostree/0.2/rpm-ostree.yaml index 0b6db9ec95..ed389aa4a4 100644 --- a/task/rpm-ostree/0.2/rpm-ostree.yaml +++ b/task/rpm-ostree/0.2/rpm-ostree.yaml @@ -87,7 +87,7 @@ spec: - env: - name: COMMIT_SHA value: $(params.COMMIT_SHA) - image: quay.io/konflux-ci/buildah-task:latest@sha256:1301e1a87a44898ab73e5dff8f6ac7499be4cb64eb7300e25d7a20ae266c87d3 + image: quay.io/redhat-appstudio/multi-platform-runner:01c7670e81d5120347cf0ad13372742489985e5f@sha256:246adeaaba600e207131d63a7f706cffdcdc37d8f600c56187123ec62823ff44 # per https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting # the cluster will set imagePullPolicy to IfNotPresent name: build @@ -225,7 +225,7 @@ spec: workingDir: $(workspaces.source.path) securityContext: runAsUser: 0 - - image: quay.io/konflux-ci/buildah-task:latest@sha256:1301e1a87a44898ab73e5dff8f6ac7499be4cb64eb7300e25d7a20ae266c87d3 + - image: quay.io/redhat-appstudio/multi-platform-runner:01c7670e81d5120347cf0ad13372742489985e5f # per https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting # the cluster will set imagePullPolicy to IfNotPresent name: inject-sbom-and-push