Merge pull request #63892 from openshift-bot/auto-config-brancher

Automate config brancher by auto-config-brancher job at Tue, 15 Apr 2025 20:05:56 UTC

Author: openshift-merge-bot[bot]

ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-master.yaml

@@ -1,8 +1,16 @@
 base_images:
-  ci_tests-private-base_4.19:
+  ci_rosa-aws-cli_latest:
+    name: rosa-aws-cli
+    namespace: ci
+    tag: latest
+  ci_tests-private-base_latest:
     name: tests-private-base
     namespace: ci
-    tag: "4.19"
+    tag: latest
+  ci_tests-private-baseui_latest:
+    name: tests-private-baseui
+    namespace: ci
+    tag: latest
   cli:
     name: "4.19"
     namespace: ocp
@@ -11,6 +19,10 @@ base_images:
     name: network-observability-cli
     namespace: netobserv
     tag: ci
+  ocp_tools:
+    name: "4.19"
+    namespace: ocp
+    tag: tools
   upi-installer:
     name: "4.19"
     namespace: ocp
@@ -23,30 +35,143 @@ build_root:
     tag: rhel-9-golang-1.23-openshift-4.19
 images:
 - dockerfile_literal: |
-    FROM bin AS builder
     FROM registry.ci.openshift.org/netobserv/network-observability-cli:ci as netobservcli
-    FROM registry.ci.openshift.org/ci/tests-private-base:4.19
-    RUN mkdir -p /go/src/github.com/openshift
-    COPY --from=builder /go/src/github.com/openshift/openshift-tests-private /go/src/github.com/openshift/openshift-tests-private
+
+    FROM registry.ci.openshift.org/ocp/4.19:tools
+    ENV ART_DNF_WRAPPER_POLICY=append
     COPY --from=netobservcli /oc-netobserv /usr/bin/
-    RUN chmod g+w /go/src/github.com/openshift/openshift-tests-private && \
+    RUN set -x && \
+        sh -c 'echo -e "[google-cloud-sdk]\nname=Google Cloud SDK\nbaseurl=https://packages.cloud.google.com/yum/repos/cloud-sdk-el7-x86_64\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg\n       https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg" > /etc/yum.repos.d/google-cloud-sdk.repo' && \
+        sh -c 'echo -e "[azure-cli]\nname=Azure CLI\nbaseurl=https://packages.microsoft.com/yumrepos/azure-cli\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" >/etc/yum.repos.d/azure-cli.repo' && \
+        PACKAGES="azure-cli google-cloud-sdk git gzip zip util-linux openssh-clients httpd-tools skopeo java-11-openjdk-headless python3-pip" && \
+        yum config-manager --disable ubi-9-appstream ubi-9-baseos ubi-9-codeready-builder && \
+        yum update -y && \
+        yum install --setopt=tsflags=nodocs -y $PACKAGES && yum clean all && rm -rf /var/cache/yum/* && \
+        git config --system user.name test-private && \
+        git config --system user.email [email protected] && \
+        chmod g+w /etc/passwd && \
+        rm -rf /root/.config/gcloud
+    RUN yum remove python3-requests -y && pip3 uninstall PyYAML -y && pip3 install --upgrade setuptools pip && pip3 install dotmap minio pyyaml requests python-openstackclient && \
+        sh -c 'echo -e "[rhel9.2-baseos]\nname=rhel9.2-baseos\nbaseurl=http://download.eng.pek2.redhat.com/rhel-9/rel-eng/RHEL-9/latest-RHEL-9.2/compose/BaseOS/x86_64/os/\nenabled=0\ngpgcheck=1" >/etc/yum.repos.d/rhel9.2-baseos.repo' && \
+        yum -y --enablerepo=rhel9.2-baseos install sos
+    RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
+        unzip -q awscliv2.zip && \
+        ./aws/install -b /bin && \
+        rm -rf ./aws awscliv2.zip
+    RUN set -x && export KREW_ROOT="/usr/local/krew" && cd "$(mktemp -d)" && \
+        OS="$(uname | tr '[:upper:]' '[:lower:]')" && \
+        ARCH="$(uname -m | sed -e 's/x86_64/amd64/' -e 's/\(arm\)\(64\)\?.*/\1\2/' -e 's/aarch64$/arm64/')" && \
+        KREW="krew-${OS}_${ARCH}" && \
+        curl -fsSLO "https://github.com/kubernetes-sigs/krew/releases/latest/download/${KREW}.tar.gz" && \
+        tar zxvf "${KREW}.tar.gz" && \
+        ./"${KREW}" install krew && chmod -R 755 /usr/local/krew && cd / && export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH" && which kubectl-krew && set +x
+  from: ocp_tools
+  inputs:
+    netobserv_network-observability-cli_ci:
+      as:
+      - registry.ci.openshift.org/netobserv/network-observability-cli:ci
+  to: tests-private-base
+- dockerfile_literal: |
+    FROM this-is-ignored
+    ARG YQ_VERSION="v4.30.8"
+    ENV ART_DNF_WRAPPER_POLICY=append
+    RUN set -x && \
+        curl --silent --location https://rpm.nodesource.com/setup_lts.x | bash - && \
+        curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
+        PACKAGES="openssh-clients httpd-tools nodejs yarn xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel nss libXScrnSaver alsa-lib" && \
+        yum install --setopt=tsflags=nodocs -y $PACKAGES && \
+        declare -A YQ_HASH=([amd64]='6c911103e0dcc54e2ba07e767d2d62bcfc77452b39ebaee45b1c46f062f4fd26' \
+                            [arm64]='95092e8b5332890c46689679b5e4360d96873c025ad8bafd961688f28ea434c7') && \
+        arch="$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/')" && \
+        YQ_URI="https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${arch}" && \
+        curl -sSL "${YQ_URI}" -o /usr/local/bin/yq && \
+        echo "${YQ_HASH[$arch]} */usr/local/bin/yq" | sha256sum --strict --status --check && \
+        chmod +x /usr/local/bin/yq && \
+        yum clean all && rm -rf /var/cache/yum/*
+  from: root
+  to: tests-private-baseui
+- dockerfile_literal: |
+    FROM bin as builder
+    FROM registry.ci.openshift.org/ci/rosa-aws-cli:latest as rosacli
+
+    FROM registry.ci.openshift.org/ci/tests-private-base:latest
+    COPY --from=builder /go/src/github.com/openshift/openshift-tests-private/bin/extended-platform-tests /usr/bin/
+    COPY --from=builder /go/src/github.com/openshift/openshift-tests-private/pipeline/handleresult.py /usr/bin/
+    COPY --from=rosacli /usr/bin/rosa /usr/bin/
+
+    RUN MIRRORURL=https://mirror2.openshift.com/pub/openshift-v4 && CLIENTURL=${MIRRORURL}/x86_64/clients/ocp/candidate && \
+        curl -s -k -L ${MIRRORURL}/x86_64/clients/ocp/ -o ocp.html && curl -s -k -L ${MIRRORURL}/x86_64/clients/ocp-dev-preview/ -o pre.html && \
+        ecver=$(grep -E "<a href=\"candidate-4\.18" pre.html |cut -d"\"" -f2|cut -d"/" -f1|sort -V|tail -1) && echo "V${ecver}V" && \
+        if [ "V${ecver}V" != "VV"  ]; then CLIENTURL=${MIRRORURL}/x86_64/clients/ocp-dev-preview/${ecver}; fi && \
+        rcgaver=$(grep -E "<a href=\"4\.18" ocp.html |cut -d"\"" -f2|cut -d"/" -f1|sort -V|tail -1) && echo "V${rcgaver}V" && \
+        if [ "V${rcgaver}V" != "VV"  ]; then CLIENTURL=${MIRRORURL}/x86_64/clients/ocp/${rcgaver}; fi && \
+        curl -s -k -L ${CLIENTURL}/openshift-client-linux-amd64-rhel9.tar.gz -o openshift-client-linux.tar.gz && \
+        curl -s -k -L ${CLIENTURL}/opm-linux-rhel9.tar.gz -o opm-linux.tar.gz  && \
+        curl -s -k -L ${CLIENTURL}/oc-mirror.rhel9.tar.gz -o oc-mirror.tar.gz && \
+        tar -C /usr/bin -xzvf openshift-client-linux.tar.gz && rm -fr openshift-client-linux.tar.gz && \
+        tar -C /usr/bin -xzvf opm-linux.tar.gz && mv /usr/bin/opm-rhel9 /usr/bin/opm && rm -fr opm-linux.tar.gz && \
+        opm version && \
+        tar -C /usr/bin/ -xzvf oc-mirror.tar.gz && chmod +x /usr/bin/oc-mirror && rm -f oc-mirror.tar.gz && \
+        SDKURL=${MIRRORURL}/x86_64/clients/operator-sdk/pre-release && \
+        curl -s -k -L ${MIRRORURL}/x86_64/clients/operator-sdk/ -o sdk.html && \
+        optsdkver=$(grep -E "<a href=\"4\.18" sdk.html |cut -d"\"" -f2|cut -d"/" -f1|sort -V|tail -1) && echo ${optsdkver} && \
+        if [ "V${optsdkver}V" != "VV"  ]; then SDKURL=${MIRRORURL}/x86_64/clients/operator-sdk/${optsdkver}; fi && \
+        curl -s -k -L ${SDKURL}/operator-sdk-linux-x86_64.tar.gz -o opt-sdk.tar.gz && \
+        tar -C ./ -xzvf opt-sdk.tar.gz && mv ./x86_64/operator-sdk /usr/bin && rm -fr opt-sdk.tar.gz ./x86_64 && \
+        opm version && oc-mirror --help && operator-sdk version && \
+        echo "try to install binary used by the cases" && oc version --client && \
+        oc image extract quay.io/hypershift/hypershift-operator:latest --file=/usr/bin/hypershift && mv hypershift /usr/bin/ && chmod 755 /usr/bin/hypershift && \
+        oc image extract quay.io/openshifttest/oc-compliance:latest --file /tmp/oc-compliance && mv oc-compliance /usr/bin/ && chmod 755 /usr/bin/oc-compliance && \
+        rosa -h && oc-compliance -h && \
+        oc image extract quay.io/openshifttest/openshift4-tools:v2 --file=/tmp/OpenShift4-tools.tar && tar -C /opt -xf OpenShift4-tools.tar && rm -fr OpenShift4-tools.tar && \
+        curl -s -L https://github.com/vmware/govmomi/releases/latest/download/govc_Linux_x86_64.tar.gz -o govc_Linux_x86_64.tar.gz && tar -C /usr/bin/ -xvf govc_Linux_x86_64.tar.gz govc && rm -f govc_Linux_x86_64.tar.gz && \
         rm -rf /usr/bin/oc /usr/bin/kubectl
-    WORKDIR /go/src/github.com/openshift/openshift-tests-private
+  from: ci_tests-private-base_latest
   inputs:
     bin:
       as:
       - bin
-    ci_tests-private-base_4.19:
+    ci_rosa-aws-cli_latest:
       as:
-      - registry.ci.openshift.org/ci/tests-private-base:4.19
-    netobserv_network-observability-cli_ci:
+      - registry.ci.openshift.org/ci/rosa-aws-cli:latest
+  to: tests-private
+- dockerfile_literal: |
+    FROM src AS builder
+    FROM this-is-ignored-and-not-used
+    RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm && \
+        yum install -y ./google-chrome-stable_current_*.rpm
+    WORKDIR /go/src/github.com/openshift/openshift-tests-private
+    COPY --from=builder /go/src/github.com/openshift/openshift-tests-private /go/src/github.com/openshift/openshift-tests-private
+  from: ci_tests-private-baseui_latest
+  inputs:
+    src:
       as:
-      - registry.ci.openshift.org/netobserv/network-observability-cli:ci
+      - src
+  to: tests-private-ui
+- dockerfile_literal: |
+    FROM bin AS builder
+    FROM this-is-ignored-and-not-used
+    WORKDIR /go/src/github.com/openshift/openshift-tests-private
+    COPY --from=builder /go/src/github.com/openshift/openshift-tests-private /go/src/github.com/openshift/openshift-tests-private
+    RUN chmod g+w /go/src/github.com/openshift/openshift-tests-private && \
+        rm -rf /usr/bin/oc /usr/bin/kubectl
+  from: ci_tests-private-base_latest
+  inputs:
+    bin:
+      as:
+      - bin
   to: tests-private-newpr
 promotion:
   to:
-  - namespace: ci
-    tag: "4.19"
+  - disabled: true
+    excluded_images:
+    - tests-private-base
+    - tests-private-baseui
+    - tests-private
+    - tests-private-ui
+    - tests-private-newpr
+    name: "4.19"
+    namespace: ocp
 releases:
   arm64-latest:
     candidate:
@@ -105,7 +230,7 @@ tests:
   optional: true
   skip_if_only_changed: (frontend/)|(images/)|(pipeline/)|(test/extended/(disaster_recovery|hypershift|kata|psap/hypernto|winc|testdata|cluster_operator/hive|ocm_terraform|rosacli|util)/)|include\.go$
   steps:
-    cluster_profile: aws
+    cluster_profile: aws-2
     test:
     - ref: enable-qe-catalogsource
     - as: pr-test

ci-operator/config/openshift-priv/openshift-tests-private/openshift-priv-openshift-tests-private-release-4.19.yaml

@@ -15,22 +15,22 @@ base_images:
     name: tests-private-baseui
     namespace: ci
     tag: latest
-  ci_tests-private-builder_4.18:
+  ci_tests-private-builder_latest:
     name: tests-private-builder
     namespace: ci
-    tag: "4.18"
+    tag: latest
   netobserv_network-observability-cli_ci:
     name: network-observability-cli
     namespace: netobserv
     tag: ci
-  ocp_4.18_tools:
-    name: "4.18"
+  ocp_4.19_tools:
+    name: "4.19"
     namespace: ocp
     tag: tools
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
+    tag: rhel-9-golang-1.23-openshift-4.19
 build_root:
   image_stream_tag:
     name: builder
@@ -43,9 +43,9 @@ images:
     ci_rosa-aws-cli_latest:
       as:
       - registry.ci.openshift.org/ci/rosa-aws-cli:latest
-    ci_tests-private-builder_4.18:
+    ci_tests-private-builder_latest:
       as:
-      - registry.ci.openshift.org/ci/tests-private-builder:4.18
+      - registry.ci.openshift.org/ci/tests-private-builder:latest
     netobserv_network-observability-cli_ci:
       as:
       - registry.ci.openshift.org/netobserv/network-observability-cli:ci
@@ -114,16 +114,16 @@ images:
   to: tests-private-tools
 - dockerfile_path: images/Dockerfile.base
   inputs:
-    ocp_4.18_tools:
+    ocp_4.19_tools:
       as:
-      - registry.ci.openshift.org/ocp/4.18:tools
+      - registry.ci.openshift.org/ocp/4.19:tools
   optional: true
   to: tests-private-base
 - dockerfile_path: images/Dockerfile.builder
   inputs:
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   optional: true
   to: tests-private-builder
 promotion: