disable s390x builds for PRs

This infra has been flakier, so reducing the dependency on it (as well as the load). Signed-off-by: arewm <[email protected]>
konflux-ci · Jan 6, 2025 · 6f7eb08 · 6f7eb08
1 parent 6ff1502
commit 6f7eb08
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 45 deletions.
diff --git a/.tekton/buildah-pull-request.yaml b/.tekton/buildah-pull-request.yaml
@@ -40,7 +40,7 @@ spec:
     - linux/x86_64
     - linux/arm64
     - linux/ppc64le
-    - linux/s390x
+    # - linux/s390x
   pipelineRef:
     name: build-pipeline
   timeouts:

diff --git a/.tekton/buildah-task-pull-request.yaml b/.tekton/buildah-task-pull-request.yaml
@@ -35,7 +35,7 @@ spec:
     - linux/x86_64
     - linux/arm64
     - linux/ppc64le
-    - linux/s390x
+    # - linux/s390x
   - name: dockerfile
     value: Containerfile.task
   pipelineRef:

diff --git a/Containerfile.buildah b/Containerfile.buildah
diff --git a/Containerfile.image_build b/Containerfile.image_build
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora-minimal:40 as builder
+FROM quay.io/centos/centos:stream10-minimal as builder
 
 ARG BUILDER_RPMS="make golang glib2-devel gpgme-devel libassuan-devel libseccomp-devel git bzip2 runc containers-common"
 RUN microdnf -y install $BUILDER_RPMS
@@ -25,20 +25,25 @@ RUN make buildah
 # that runs safely with privileges within the container.
 #
 
-FROM registry.fedoraproject.org/fedora-minimal:40
+FROM quay.io/centos/centos:stream10-minimal
 
 LABEL "io.containers.capabilities"="CHOWN,DAC_OVERRIDE,FOWNER,FSETID,KILL,NET_BIND_SERVICE,SETFCAP,SETGID,SETPCAP,SETUID,CHOWN,DAC_OVERRIDE,FOWNER,FSETID,KILL,NET_BIND_SERVICE,SETFCAP,SETGID,SETPCAP,SETUID,SYS_CHROOT"
-LABEL name="buildah" \
-      summary="Containerized version of buildah which can be used to build OCI artifacts" \
-      com.redhat.component="konflux-ci-buildah" \
+LABEL \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.vendor="Konflux CI" \
+      org.opencontainers.image.vendor="Konflux CI" \
+      org.opencontainers.image.url="https://quay.io/konflux-ci/buildah" \
+      org.opencontainers.image.source="https://github.com/konflux-ci/buildah-container" \
+      org.label-schema.name="buildah" \
+      org.opencontainers.image.title="buildah" \
+      name="konflux-buildah" \
+      com.redhat.component="konflux-buildah" \
+      io.k8s.display-name="konflux-buildah" \
+      io.openshift.tags="buildah oci" \
+      summary="Containerized version of buildah which can be used to build OCI artifacts within Konflux CI." \
       description="OCI images and artifacts are central to the architecture of Konflux. In order to ensure that we can always take advantage of the latest functionality, this image can be used to reliably build the latest version of the CLI." \
-      io.k8s.display-name="buildah" \
       io.k8s.description="OCI images and artifacts are central to the architecture of Konflux. In order to ensure that we can always take advantage of the latest functionality, this image can be used to reliably build the latest version of the CLI." \
-      io.openshift.tags="oci" \
-      vendor="Red Hat, Inc." \
-      distribution-scope="public" \
-      release="0" \
-      url="github.com/konflux-ci/buildah-container"
+      org.opencontainers.image.documentation="https://github.com/containers/image_build/blob/main/buildah/README.md"
 
 ARG INSTALL_RPMS="buildah fuse-overlayfs ucpp"