From 6f7eb089d59f7102fff8acc7b62cba6b98f39501 Mon Sep 17 00:00:00 2001 From: arewm Date: Mon, 6 Jan 2025 15:02:44 -0500 Subject: [PATCH] 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 --- .tekton/buildah-pull-request.yaml | 2 +- .tekton/buildah-task-pull-request.yaml | 2 +- Containerfile.buildah | 32 -------------------------- Containerfile.image_build | 27 +++++++++++++--------- 4 files changed, 18 insertions(+), 45 deletions(-) delete mode 100644 Containerfile.buildah diff --git a/.tekton/buildah-pull-request.yaml b/.tekton/buildah-pull-request.yaml index c606410..8af9449 100644 --- 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 index b3abce1..bf5a9d0 100644 --- 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 deleted file mode 100644 index 9a0949b..0000000 --- a/Containerfile.buildah +++ /dev/null @@ -1,32 +0,0 @@ -# Source from buildah/contrib/docker/Dockerfile -FROM quay.io/centos/centos:stream10-minimal - -# Ensure that labels are overwritten from parent image while also setting relevant new labels. -# This includes overwriting the relevant org.label-schema labels used by centos stream as well as -# creating new labels according to the image-spec: https://github.com/opencontainers/image-spec/blob/main/annotations.md -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" \ - summary="Command line tool to create and work with containers." \ - description="Command line tool to create and work with containers. This is a repackaged version for use within Konflux CI." \ - io.k8s.description="Command line tool to create and work with containers. This is a repackaged version for use within Konflux CI." \ - org.opencontainers.image.documentation="https://github.com/containers/image_build/blob/main/buildah/README.md" - - -RUN dnf -y update && dnf -y clean all -RUN dnf -y install btrfs-progs-devel containers-common golang go-md2man gpgme-devel libassuan-devel libseccomp-devel make net-tools runc shadow-utils glibc-static libselinux-static libseccomp-static && dnf -y clean all -COPY . /go/src/github.com/containers/buildah -RUN env GOPATH=/go make -C /go/src/github.com/containers/buildah clean all install -RUN sed -i -r -e 's,driver = ".*",driver = "vfs",g' /etc/containers/storage.conf -ENV BUILDAH_ISOLATION chroot -WORKDIR /root -CMD /bin/bash \ No newline at end of file diff --git a/Containerfile.image_build b/Containerfile.image_build index 02ff3e9..1d8a66e 100644 --- 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"