From 7eea1457796c000e761b4233f46628ad79651ff9 Mon Sep 17 00:00:00 2001 From: Gregory Giguashvili Date: Fri, 5 Sep 2025 09:52:23 +0300 Subject: [PATCH] Disable CentOS images and scenarios in 4.19 branch --- test/image-blueprints-bootc/README.md | 5 +-- .../group2/centos9-bootc.image-bootc | 1 - .../group1/cos9-bootc-source.containerfile | 34 -------------- .../cos9-bootc-source-isolated.containerfile | 17 ------- .../cos9-bootc-source-kindnet.containerfile | 20 --------- .../cos9-bootc-source-optionals.containerfile | 23 ---------- .../includes/post-cos9rpm.cfg | 45 ------------------- .../kickstart-centos.ks.template | 21 --------- .../microshift-centos9-nfv.repo | 7 --- .../periodics/cos9-src@greenboot.sh | 16 ------- .../periodics/cos9-src@isolated-net.sh | 22 --------- .../periodics/cos9-src@kindnet.sh | 23 ---------- .../periodics/cos9-src@multi-nic.sh | 24 ---------- .../periodics/cos9-src@optional.sh | 35 --------------- .../presubmits/cos9-src@standard-suite1.sh | 18 -------- .../presubmits/cos9-src@standard-suite2.sh | 16 ------- 16 files changed, 2 insertions(+), 325 deletions(-) delete mode 100644 test/image-blueprints-bootc/layer1-base/group2/centos9-bootc.image-bootc delete mode 100644 test/image-blueprints-bootc/layer2-presubmit/group1/cos9-bootc-source.containerfile delete mode 100644 test/image-blueprints-bootc/layer3-periodic/group3/cos9-bootc-source-isolated.containerfile delete mode 100644 test/image-blueprints-bootc/layer3-periodic/group3/cos9-bootc-source-kindnet.containerfile delete mode 100644 test/image-blueprints-bootc/layer3-periodic/group3/cos9-bootc-source-optionals.containerfile delete mode 100644 test/kickstart-templates/includes/post-cos9rpm.cfg delete mode 100644 test/kickstart-templates/kickstart-centos.ks.template delete mode 100644 test/package-sources-bootc/microshift-centos9-nfv.repo delete mode 100644 test/scenarios-bootc/periodics/cos9-src@greenboot.sh delete mode 100644 test/scenarios-bootc/periodics/cos9-src@isolated-net.sh delete mode 100644 test/scenarios-bootc/periodics/cos9-src@kindnet.sh delete mode 100644 test/scenarios-bootc/periodics/cos9-src@multi-nic.sh delete mode 100644 test/scenarios-bootc/periodics/cos9-src@optional.sh delete mode 100644 test/scenarios-bootc/presubmits/cos9-src@standard-suite1.sh delete mode 100644 test/scenarios-bootc/presubmits/cos9-src@standard-suite2.sh diff --git a/test/image-blueprints-bootc/README.md b/test/image-blueprints-bootc/README.md index b0904a1967..fa1de4bea3 100644 --- a/test/image-blueprints-bootc/README.md +++ b/test/image-blueprints-bootc/README.md @@ -25,7 +25,7 @@ Artifacts built in this layer cannot be cached as they depend on the current sou |Group |Build Time|Description| |------|----------|-----------| -|group1| Short | Current source prerequisites (RHEL and CentOS) used in presubmits and periodics +|group1| Short | Current source prerequisites on RHEL used in presubmits and periodics |group2| Short | Current source artifacts on RHEL used in presubmits and periodics > Note: Total build times are up to 5 minutes. @@ -36,8 +36,7 @@ Artifacts built in this layer cannot be cached as they depend on the current sou |Group |Build Time|Description| |------|----------|-----------| -|group1| Average | Current source prerequisites (RHEL and CentOS) used only in periodics +|group1| Average | Current source prerequisites on RHEL used only in periodics |group2| Average | Current source artifacts on RHEL used only in periodics -|group3| Average | Current source artifacts on CentOS used only in periodics > Note: Total build times are up to 15 minutes. diff --git a/test/image-blueprints-bootc/layer1-base/group2/centos9-bootc.image-bootc b/test/image-blueprints-bootc/layer1-base/group2/centos9-bootc.image-bootc deleted file mode 100644 index 5099ec7dfc..0000000000 --- a/test/image-blueprints-bootc/layer1-base/group2/centos9-bootc.image-bootc +++ /dev/null @@ -1 +0,0 @@ -quay.io/centos-bootc/centos-bootc:stream9 \ No newline at end of file diff --git a/test/image-blueprints-bootc/layer2-presubmit/group1/cos9-bootc-source.containerfile b/test/image-blueprints-bootc/layer2-presubmit/group1/cos9-bootc-source.containerfile deleted file mode 100644 index 850e0c0b55..0000000000 --- a/test/image-blueprints-bootc/layer2-presubmit/group1/cos9-bootc-source.containerfile +++ /dev/null @@ -1,34 +0,0 @@ -FROM quay.io/centos-bootc/centos-bootc:stream9 - -# Build arguments -ARG USHIFT_RPM_REPO_NAME=microshift-local -ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME - -# Copy the MicroShift repository contents -COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH - -# Copy repository configuration -COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-centos9-nfv.repo ./bootc-images/microshift-rhocp-y.repo \ - /etc/yum.repos.d/ - -# Print repository configuration contents. -# Install MicroShift and cleanup. -RUN dnf repoinfo --enabled && \ - dnf install -y firewalld systemd-resolved \ - "microshift-{{ .Env.SOURCE_VERSION }}" "microshift-release-info-{{ .Env.SOURCE_VERSION }}" && \ - systemctl enable microshift && \ - rm -vf /etc/yum.repos.d/microshift-*.repo && \ - rm -rvf $USHIFT_RPM_REPO_PATH && \ - dnf clean all - -# Configure firewall -RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \ - firewall-offline-cmd --zone=trusted --add-source=10.42.0.0/16 && \ - firewall-offline-cmd --zone=trusted --add-source=169.254.169.1 && \ - firewall-offline-cmd --zone=trusted --add-source=fd01::/48 && \ - firewall-offline-cmd --zone=public --add-port=80/tcp && \ - firewall-offline-cmd --zone=public --add-port=443/tcp && \ - firewall-offline-cmd --zone=public --add-port=5353/udp && \ - firewall-offline-cmd --zone=public --add-port=6443/tcp && \ - firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \ - firewall-offline-cmd --zone=public --add-port=30000-32767/udp diff --git a/test/image-blueprints-bootc/layer3-periodic/group3/cos9-bootc-source-isolated.containerfile b/test/image-blueprints-bootc/layer3-periodic/group3/cos9-bootc-source-isolated.containerfile deleted file mode 100644 index a5553d0e83..0000000000 --- a/test/image-blueprints-bootc/layer3-periodic/group3/cos9-bootc-source-isolated.containerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM localhost/cos9-bootc-source:latest - -# Embed images based on contents of release-info RPMs -COPY --chmod=755 ./bootc-images/microshift-copy-images.sh /usr/bin/microshift-copy-images -RUN --mount=type=secret,id=pullsecret,dst=/run/secrets/pull-secret.json \ - images="$(jq -r ".images[]" /usr/share/microshift/release/release-"$(uname -m)".json)" ; \ - images="${images} quay.io/microshift/busybox:1.36" ; \ - IMAGE_PULL_LIST="${images}" /usr/bin/microshift-copy-images pull - -# Install a systemd drop-in unit to address the problem with image upgrades -# overwriting the container images in additional store. The workaround is to -# copy the images from the pre-loaded to the main container storage directory. -# In this case, it is not necessary to update /etc/containers/storage.conf with -# the additional store path. -# See https://issues.redhat.com/browse/RHEL-75827 -RUN mkdir -p /usr/lib/systemd/system/microshift.service.d -COPY --chmod=644 ./bootc-images/microshift-copy-images.conf /usr/lib/systemd/system/microshift.service.d/microshift-copy-images.conf diff --git a/test/image-blueprints-bootc/layer3-periodic/group3/cos9-bootc-source-kindnet.containerfile b/test/image-blueprints-bootc/layer3-periodic/group3/cos9-bootc-source-kindnet.containerfile deleted file mode 100644 index a56023f666..0000000000 --- a/test/image-blueprints-bootc/layer3-periodic/group3/cos9-bootc-source-kindnet.containerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM localhost/cos9-bootc-source:latest - -# Build arguments -ARG USHIFT_RPM_REPO_NAME=microshift-local -ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME - -# Copy the MicroShift repository contents -COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH - -# Copy repository configuration -COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-centos9-nfv.repo ./bootc-images/microshift-rhocp-y.repo \ - /etc/yum.repos.d/ - -# Print repository configuration contents. -# Install MicroShift optional packages and cleanup. -RUN dnf repoinfo --enabled && \ - dnf install -y "microshift-kindnet-{{ .Env.SOURCE_VERSION }}" && \ - rm -vf /etc/yum.repos.d/microshift-*.repo && \ - rm -rvf $USHIFT_RPM_REPO_PATH && \ - dnf clean all diff --git a/test/image-blueprints-bootc/layer3-periodic/group3/cos9-bootc-source-optionals.containerfile b/test/image-blueprints-bootc/layer3-periodic/group3/cos9-bootc-source-optionals.containerfile deleted file mode 100644 index 9388588c22..0000000000 --- a/test/image-blueprints-bootc/layer3-periodic/group3/cos9-bootc-source-optionals.containerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM localhost/cos9-bootc-source:latest - -# Build arguments -ARG USHIFT_RPM_REPO_NAME=microshift-local -ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME - -# Copy the MicroShift repository contents -COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH - -# Copy repository configuration -COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo ./bootc-images/microshift-centos9-nfv.repo ./bootc-images/microshift-rhocp-y.repo \ - /etc/yum.repos.d/ - -# Print repository configuration contents. -# Install MicroShift optional packages and cleanup. -RUN dnf repoinfo --enabled && \ - dnf install -y "microshift-olm-{{ .Env.SOURCE_VERSION }}" \ - "microshift-multus-{{ .Env.SOURCE_VERSION }}" \ - "microshift-gateway-api-{{ .Env.SOURCE_VERSION }}" \ - "microshift-observability-{{ .Env.SOURCE_VERSION }}" && \ - rm -vf /etc/yum.repos.d/microshift-*.repo && \ - rm -rvf $USHIFT_RPM_REPO_PATH && \ - dnf clean all diff --git a/test/kickstart-templates/includes/post-cos9rpm.cfg b/test/kickstart-templates/includes/post-cos9rpm.cfg deleted file mode 100644 index deef0472a9..0000000000 --- a/test/kickstart-templates/includes/post-cos9rpm.cfg +++ /dev/null @@ -1,45 +0,0 @@ -# MicroShift local RPM repository -cat > "/etc/yum.repos.d/microshift-local.repo" < "/etc/yum.repos.d/openvswitch2-rpms.repo" < "/etc/yum.repos.d/${OCPREPO}.repo" <