diff --git a/ci_transforms/rhel-7/base-repos/Dockerfile b/ci_transforms/rhel-7/base-repos/Dockerfile deleted file mode 100644 index 073b861068..0000000000 --- a/ci_transforms/rhel-7/base-repos/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM replaced-by-buildconfig -# Baseline Dockerfile for layering repos atop an ART image to construct an -# ART equivalent image. -# Used as a template for 'images:streams gen-buildconfigs' - - diff --git a/ci_transforms/rhel-7/ci-build-root/Dockerfile b/ci_transforms/rhel-7/ci-build-root/Dockerfile deleted file mode 100644 index 1ba255a23a..0000000000 --- a/ci_transforms/rhel-7/ci-build-root/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -FROM replaced-by-buildconfig -# Serves as a standard build environment for OpenShift builds. It is ultimately based on the -# ART golang builder and has packages layered on top of support CI only use cases -# (e.g. compiling test cases) that simply don't occur downstream. -# Used as a template for 'images:streams gen-buildconfigs' - -ENV OPENSHIFT_CI=true - -# Install common CI tools and epel for packages like tito. -RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ - INSTALL_PKGS="bc bind-utils bsdtar bzr ceph-common createrepo device-mapper device-mapper-persistent-data e2fsprogs ethtool file findutils gcc git glibc-static glib2-devel gpgme gpgme-devel hostname iptables jq krb5-devel libassuan libassuan-devel libseccomp-devel libvirt-devel lsof make mercurial nmap-ncat openssl protobuf-compiler protobuf-devel rsync socat systemd-devel sysvinit-tools tar tito tree util-linux wget which xfsprogs zip goversioninfo gettext" && \ - yum install -y $INSTALL_PKGS && \ - rpm -V $INSTALL_PKGS && \ - yum clean all && \ - touch /os-build-image && \ - git config --system user.name origin-release-container && \ - git config --system user.email origin-release@redhat.com - -# Install common go tools upstream devs are expecting in CI. -# Pure cargo culting from https://github.com/openshift/release/blob/51d92eb6a6d730e932a5daf68829ca7936739904/projects/origin-release/golang-1.13/Dockerfile#L41 -RUN GOFLAGS='' go install golang.org/x/tools/cmd/cover@latest && \ - GOFLAGS='' go install golang.org/x/tools/cmd/goimports@latest && \ - GOFLAGS='' go install github.com/tools/godep@latest && \ - GOFLAGS='' go install golang.org/x/lint/golint@latest && \ - GOFLAGS='' go install gotest.tools/gotestsum@latest && \ - GOFLAGS='' go install github.com/openshift/release/tools/gotest2junit@latest && \ - GOFLAGS='' go install github.com/openshift/imagebuilder/cmd/imagebuilder@latest && \ - mv $GOPATH/bin/* /usr/bin/ && \ - rm -rf $GOPATH/* $GOPATH/.cache && \ - mkdir $GOPATH/bin && \ - mkdir -p /go/src/github.com/openshift/origin && \ - ln -s /usr/bin/imagebuilder $GOPATH/bin/imagebuilder && \ - ln -s /usr/bin/goimports $GOPATH/bin/goimports && \ - curl -L https://github.com/golang/dep/releases/download/v0.5.4/dep-linux-amd64 > /usr/bin/dep && \ - chmod +x /usr/bin/dep - -RUN chmod g+xw -R $GOPATH && \ - chmod g+xw -R $(go env GOROOT) - -# Some image building tools don't create a missing WORKDIR -RUN mkdir -p /go/src/github.com/openshift/origin -WORKDIR /go/src/github.com/openshift/origin diff --git a/ci_transforms/rhel-7/golang/Dockerfile b/ci_transforms/rhel-7/golang/Dockerfile deleted file mode 100644 index e858ed9caf..0000000000 --- a/ci_transforms/rhel-7/golang/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM replaced-by-buildconfig -# Layers CI appropriate yum repository configurations on top of the ART builder images. -# Used as a template for 'images:streams gen-buildconfigs' - -ENV GOARM=5 \ - LOGNAME=deadbeef \ - GOCACHE=/go/.cache \ - GOPATH=/go \ - LOGNAME=deadbeef -ENV PATH=$PATH:$GOPATH/bin -ENV OPENSHIFT_CI=true - -# make go related directories writeable since builds in CI will run as non-root. -RUN mkdir -p $GOPATH && \ - chmod g+xw -R $GOPATH && \ - chmod g+xw -R $(go env GOROOT) - -# Some image building tools don't create a missing WORKDIR -RUN mkdir -p /go/src/github.com/openshift/origin -WORKDIR /go/src/github.com/openshift/origin - diff --git a/ci_transforms/rhel-8/base-repos/Dockerfile b/ci_transforms/rhel-8/base-repos/Dockerfile deleted file mode 100644 index efa4b01d03..0000000000 --- a/ci_transforms/rhel-8/base-repos/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM replaced-by-buildconfig -# Baseline Dockerfile for layering repos atop an ART image to construct an -# ART equivalent image. -# Used as a template for 'images:streams gen-buildconfigs' diff --git a/ci_transforms/rhel-8/ci-build-root/Dockerfile b/ci_transforms/rhel-8/ci-build-root/Dockerfile deleted file mode 100644 index d49120453f..0000000000 --- a/ci_transforms/rhel-8/ci-build-root/Dockerfile +++ /dev/null @@ -1,77 +0,0 @@ -FROM replaced-by-buildconfig -# Serves as a standard build environment for OpenShift builds. It is based on the -# ART golang builder and has packages layered on top of support CI only use cases -# (e.g. compiling test cases) that simply don't occur downstream. -# Used as a template for 'images:streams gen-buildconfigs' - -# Turn off FIPSorDie. This was inspired by 4.13. o/kubernetes which compiles the hyperkube binary using -# a rhel8 ci-build-root and layers that on top of the rhel9 rhcos. This causes -# a FIPSorDie kubelet binary to fail to start on the bootstrap node. FIPSorDie is more -# trouble than it is worth and should not be need to catch actual FIPS issues. -ENV GO_COMPLIANCE_POLICY=exempt_all - -# Turn off information for CI environment. This is usually just noise for upstream -# engineers and can complicate debug. When issues arise, have repos export -# GO_COMPLIANCE_INFO=1 or GO_COMPLIANCE_DEBUG=1 before running go. -ENV GO_COMPLIANCE_INFO=0 - -# Install, matching upstream k8s, protobuf-3.x, see: -# https://github.com/kubernetes/kubernetes/blob/master/hack/lib/protoc.sh -# and etcd, see: -# https://github.com/kubernetes/kubernetes/blob/master/hack/lib/etcd.sh -# for CI only testing. -ENV PATH=/opt/google/protobuf/bin:$PATH -RUN set -euxo pipefail && \ - f=$( mktemp ) && \ - curl --fail -L https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protoc-23.4-linux-x86_64.zip > "${f}" && \ - mkdir -p /opt/google/protobuf && \ - unzip "${f}" -d /opt/google/protobuf && \ - curl --fail -L https://github.com/coreos/etcd/releases/download/v3.5.15/etcd-v3.5.15-linux-amd64.tar.gz | tar -f - -xz --no-same-owner -C /usr/local/bin --strip-components=1 etcd-v3.5.15-linux-amd64/etcd - -# Install common CI tools used for unit testing. -# Note that CI_PINNED_GIT_VERSION restricts the version of git -# used. This is because RHEL released a new version of git (https://access.redhat.com/errata/RHSA-2024:0407) -# which disables safe.directory, which is used by our CI -# to permit non-root users from interacting with git in -# CI workload pods: https://github.com/openshift/ci-tools/blob/acad25edd747d5a21c839c60d480aaf7902961ec/pkg/steps/pod.go#L241 -RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ - INSTALL_PKGS="bc procps-ng util-linux bind-utils bsdtar createrepo_c device-mapper device-mapper-persistent-data e2fsprogs ethtool file findutils gcc git glib2-devel gpgme gpgme-devel hostname iptables jq krb5-devel libassuan libassuan-devel libseccomp-devel libvirt-devel lsof make mercurial nmap-ncat openssl rsync socat systemd-devel tar tito tree wget which xfsprogs zip goversioninfo gettext python3 iproute" && \ - yum install -y $INSTALL_PKGS && \ - alternatives --set python /usr/bin/python3 && \ - yum clean all && \ - touch /os-build-image && \ - git config --system user.name origin-release-container && \ - git config --system user.email origin-release@redhat.com - -# Install common go tools upstream devs are expecting in CI. -# Pure cargo culting from https://github.com/openshift/release/blob/51d92eb6a6d730e932a5daf68829ca7936739904/projects/origin-release/golang-1.13/Dockerfile#L41 -# Clear GOFLAGS temporarily for 1.12 bug:https://github.com/golang/go/issues/32502 -RUN GOFLAGS='' go install golang.org/x/tools/cmd/cover@latest && \ - GOFLAGS='' go install golang.org/x/tools/cmd/goimports@latest && \ - GOFLAGS='' go install github.com/tools/godep@latest && \ - GOFLAGS='' go install golang.org/x/lint/golint@latest && \ - GOFLAGS='' go install gotest.tools/gotestsum@latest && \ - GOFLAGS='' go install github.com/openshift/release/tools/gotest2junit@latest && \ - GOFLAGS='' go install github.com/openshift/imagebuilder/cmd/imagebuilder@latest && \ - mv $GOPATH/bin/* /usr/bin/ && \ - rm -rf $GOPATH/* $GOPATH/.cache && \ - mkdir $GOPATH/bin && \ - mkdir -p /go/src/github.com/openshift/origin && \ - ln -s /usr/bin/imagebuilder $GOPATH/bin/imagebuilder && \ - ln -s /usr/bin/goimports $GOPATH/bin/goimports && \ - curl --fail -L https://github.com/golang/dep/releases/download/v0.5.4/dep-linux-amd64 > /usr/bin/dep && \ - chmod +x /usr/bin/dep - -# make go related directories writeable since builds in CI will run as non-root. -RUN mkdir -p $GOPATH && \ - chmod g+xw -R $GOPATH && \ - chmod g+xw -R $(go env GOROOT) - -# Assert packages in separate RUN block so we are sure env variables are set up correctly -RUN set -euxo pipefail && \ - command -v protoc && protoc --version && [ "$( protoc --version )" = "libprotoc 23.4" ] && \ - command -v etcd && etcd --version && [ "$( etcd --version | head -n1 )" = "etcd Version: 3.5.15" ] - -# Some image building tools don't create a missing WORKDIR -RUN mkdir -p /go/src/github.com/openshift/origin -WORKDIR /go/src/github.com/openshift/origin diff --git a/ci_transforms/rhel-8/ci-build-root/OWNERS b/ci_transforms/rhel-8/ci-build-root/OWNERS deleted file mode 100644 index 494c29e0af..0000000000 --- a/ci_transforms/rhel-8/ci-build-root/OWNERS +++ /dev/null @@ -1,14 +0,0 @@ -approvers: -- tnozicka -- jupierce -- sttts -- hexfusion -- mfojtik -- soltysh -reviewers: -- tnozicka -- jupierce -- sttts -- hexfusion -- mfojtik -- soltysh diff --git a/ci_transforms/rhel-8/golang/Dockerfile b/ci_transforms/rhel-8/golang/Dockerfile deleted file mode 100644 index ca160a3d25..0000000000 --- a/ci_transforms/rhel-8/golang/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM replaced-by-buildconfig -# Layers CI appropriate yum repository configurations on top of the ART builder images. -# Used as a template for 'images:streams gen-buildconfigs' - -# Turn off information for CI environment. This is usually just noise for upstream -# engineers and can complicate debug. When issues arise, have repos export -# GO_COMPLIANCE_INFO=1 or GO_COMPLIANCE_DEBUG=1 before running go. -ENV GO_COMPLIANCE_INFO=0 - -ENV GOARM=5 \ - LOGNAME=deadbeef \ - GOCACHE=/go/.cache \ - GOPATH=/go \ - LOGNAME=deadbeef -ENV PATH=$PATH:$GOPATH/bin - -# make go related directories writeable since builds in CI will run as non-root. -RUN mkdir -p $GOPATH && \ - chmod g+xw -R $GOPATH && \ - chmod g+xw -R $(go env GOROOT) - -# Some image building tools don't create a missing WORKDIR -RUN mkdir -p /go/src/github.com/openshift/origin -WORKDIR /go/src/github.com/openshift/origin diff --git a/ci_transforms/rhel-9/ci-build-root/Dockerfile b/ci_transforms/rhel-9/ci-build-root/Dockerfile deleted file mode 100644 index 48f6a78de3..0000000000 --- a/ci_transforms/rhel-9/ci-build-root/Dockerfile +++ /dev/null @@ -1,76 +0,0 @@ -FROM replaced-by-buildconfig -# Serves as a standard build environment for OpenShift builds. It is based on the -# ART golang builder and has packages layered on top of support CI only use cases -# (e.g. compiling test cases) that simply don't occur downstream. -# Used as a template for 'images:streams gen-buildconfigs' - -# Turn off FIPSorDie. This was inspired by 4.13. o/kubernetes which compiles the hyperkube binary using -# a rhel8 ci-build-root and layers that on top of the rhel9 rhcos. This causes -# a FIPSorDie kubelet binary to fail to start on the bootstrap node. FIPSorDie is more -# trouble than it is worth and should not be need to catch actual FIPS issues. -ENV GO_COMPLIANCE_POLICY=exempt_all - -# Turn off information for CI environment. This is usually just noise for upstream -# engineers and can complicate debug. When issues arise, have repos export -# GO_COMPLIANCE_INFO=1 or GO_COMPLIANCE_DEBUG=1 before running go. -ENV GO_COMPLIANCE_INFO=0 - -# Install, matching upstream k8s, protobuf-3.x, see: -# https://github.com/kubernetes/kubernetes/blob/master/hack/lib/protoc.sh -# and etcd, see: -# https://github.com/kubernetes/kubernetes/blob/master/hack/lib/etcd.sh -# for CI only testing. -ENV PATH=/opt/google/protobuf/bin:$PATH -RUN set -euxo pipefail && \ - f=$( mktemp ) && \ - curl --fail -L https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protoc-23.4-linux-x86_64.zip > "${f}" && \ - mkdir -p /opt/google/protobuf && \ - unzip "${f}" -d /opt/google/protobuf && \ - curl --fail -L https://github.com/coreos/etcd/releases/download/v3.5.15/etcd-v3.5.15-linux-amd64.tar.gz | tar -f - -xz --no-same-owner -C /usr/local/bin --strip-components=1 etcd-v3.5.15-linux-amd64/etcd - -# Install common CI tools used for unit testing. -# Note that CI_PINNED_GIT_VERSION restricts the version of git -# used. This is because RHEL released a new version of git (https://access.redhat.com/errata/RHSA-2024:0407) -# which disables safe.directory, which is used by our CI -# to permit non-root users from interacting with git in -# CI workload pods: https://github.com/openshift/ci-tools/blob/acad25edd747d5a21c839c60d480aaf7902961ec/pkg/steps/pod.go#L241 -RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ - INSTALL_PKGS="bc procps-ng util-linux bind-utils bsdtar createrepo_c device-mapper device-mapper-persistent-data e2fsprogs ethtool file findutils gcc git glib2-devel gpgme gpgme-devel hostname iptables jq krb5-devel libassuan libassuan-devel libseccomp-devel lsof make nmap-ncat openssl rsync socat systemd-devel tar tree wget which xfsprogs zip goversioninfo gettext python3 iproute rpm-build" && \ - yum install -y $INSTALL_PKGS && \ - yum clean all && \ - touch /os-build-image && \ - git config --system user.name origin-release-container && \ - git config --system user.email origin-release@redhat.com - -# Install common go tools upstream devs are expecting in CI. -# Pure cargo culting from https://github.com/openshift/release/blob/51d92eb6a6d730e932a5daf68829ca7936739904/projects/origin-release/golang-1.13/Dockerfile#L41 -# Clear GOFLAGS temporarily for 1.12 bug:https://github.com/golang/go/issues/32502 -RUN GOFLAGS='' GO111MODULE=on go install golang.org/x/tools/cmd/cover@latest && \ - GOFLAGS='' GO111MODULE=on go install golang.org/x/tools/cmd/goimports@latest && \ - GOFLAGS='' GO111MODULE=on go install github.com/tools/godep@latest && \ - GOFLAGS='' GO111MODULE=on go install golang.org/x/lint/golint@latest && \ - GOFLAGS='' GO111MODULE=on go install gotest.tools/gotestsum@latest && \ - GOFLAGS='' GO111MODULE=on go install github.com/openshift/release/tools/gotest2junit@latest && \ - GOFLAGS='' GO111MODULE=on go install github.com/openshift/imagebuilder/cmd/imagebuilder@latest && \ - mv $GOPATH/bin/* /usr/bin/ && \ - rm -rf $GOPATH/* $GOPATH/.cache && \ - mkdir $GOPATH/bin && \ - mkdir -p /go/src/github.com/openshift/origin && \ - ln -s /usr/bin/imagebuilder $GOPATH/bin/imagebuilder && \ - ln -s /usr/bin/goimports $GOPATH/bin/goimports && \ - curl --fail -L https://github.com/golang/dep/releases/download/v0.5.4/dep-linux-amd64 > /usr/bin/dep && \ - chmod +x /usr/bin/dep - -# make go related directories writeable since builds in CI will run as non-root. -RUN mkdir -p $GOPATH && \ - chmod g+xw -R $GOPATH && \ - chmod g+xw -R $(go env GOROOT) - -# Assert packages in separate RUN block so we are sure env variables are set up correctly -RUN set -euxo pipefail && \ - command -v protoc && protoc --version && [ "$( protoc --version )" = "libprotoc 23.4" ] && \ - command -v etcd && etcd --version && [ "$( etcd --version | head -n1 )" = "etcd Version: 3.5.15" ] - -# Some image building tools don't create a missing WORKDIR -RUN mkdir -p /go/src/github.com/openshift/origin -WORKDIR /go/src/github.com/openshift/origin diff --git a/ci_transforms/rhel-9/golang/Dockerfile b/ci_transforms/rhel-9/golang/Dockerfile deleted file mode 100644 index ca160a3d25..0000000000 --- a/ci_transforms/rhel-9/golang/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM replaced-by-buildconfig -# Layers CI appropriate yum repository configurations on top of the ART builder images. -# Used as a template for 'images:streams gen-buildconfigs' - -# Turn off information for CI environment. This is usually just noise for upstream -# engineers and can complicate debug. When issues arise, have repos export -# GO_COMPLIANCE_INFO=1 or GO_COMPLIANCE_DEBUG=1 before running go. -ENV GO_COMPLIANCE_INFO=0 - -ENV GOARM=5 \ - LOGNAME=deadbeef \ - GOCACHE=/go/.cache \ - GOPATH=/go \ - LOGNAME=deadbeef -ENV PATH=$PATH:$GOPATH/bin - -# make go related directories writeable since builds in CI will run as non-root. -RUN mkdir -p $GOPATH && \ - chmod g+xw -R $GOPATH && \ - chmod g+xw -R $(go env GOROOT) - -# Some image building tools don't create a missing WORKDIR -RUN mkdir -p /go/src/github.com/openshift/origin -WORKDIR /go/src/github.com/openshift/origin diff --git a/images/atomic-openshift-cluster-autoscaler.yml b/images/atomic-openshift-cluster-autoscaler.yml index ca89704f81..e0eec2a3f5 100644 --- a/images/atomic-openshift-cluster-autoscaler.yml +++ b/images/atomic-openshift-cluster-autoscaler.yml @@ -22,7 +22,7 @@ for_payload: true from: builder: - stream: rhel-9-golang - member: openshift-base-rhel9 + member: openshift-enterprise-base-rhel9 labels: License: ASL 2.0 io.k8s.description: Cluster Autoscaler for OpenShift and Kubernetes. diff --git a/images/ci-openshift-base.rhel9.yml b/images/ci-openshift-base.rhel9.yml index 7292f06aca..3931af7242 100644 --- a/images/ci-openshift-base.rhel9.yml +++ b/images/ci-openshift-base.rhel9.yml @@ -13,7 +13,15 @@ content: enabled: false mirror: true mirror_manifest_list: true - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-enterprise-base-multi-openshift-{MAJOR}.{MINOR} + upstream_image: registry.ci.openshift.org/ocp/{MAJOR}.{MINOR}:base-rhel9 + + okd_alignment: + # The tag name in the okd stream to which this image should be promoted + tag_name: base-stream9 + inject_rpm_repositories: + - id: rhel-9-server-ose + baseurl: http://base-{MAJOR}-{MINOR}-rhel9.ocp.svc/rhel-9-server-ose + from: member: openshift-enterprise-base-rhel9 labels: diff --git a/images/ci-openshift-build-root-latest.rhel8.yml b/images/ci-openshift-build-root-latest.rhel8.yml index c2e9800951..26ac638583 100644 --- a/images/ci-openshift-build-root-latest.rhel8.yml +++ b/images/ci-openshift-build-root-latest.rhel8.yml @@ -13,7 +13,7 @@ content: enabled: false mirror: true mirror_manifest_list: true - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_LATEST}-ci-build-root-multi-openshift-{MAJOR}.{MINOR} + upstream_image: registry.ci.openshift.org/openshift/release:rhel-8-release-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR} from: member: ci-openshift-golang-builder-latest.rhel8 labels: diff --git a/images/ci-openshift-build-root-latest.rhel9.yml b/images/ci-openshift-build-root-latest.rhel9.yml index 4822b61d73..f1d2a5d56e 100644 --- a/images/ci-openshift-build-root-latest.rhel9.yml +++ b/images/ci-openshift-build-root-latest.rhel9.yml @@ -13,7 +13,7 @@ content: enabled: false mirror: true mirror_manifest_list: true - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_LATEST}-ci-build-root-multi-openshift-{MAJOR}.{MINOR} + upstream_image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR} from: member: ci-openshift-golang-builder-latest.rhel9 labels: diff --git a/images/ci-openshift-build-root-previous.rhel8.disabled b/images/ci-openshift-build-root-previous.rhel8.disabled index f89d52870d..4bf7ee1c8c 100644 --- a/images/ci-openshift-build-root-previous.rhel8.disabled +++ b/images/ci-openshift-build-root-previous.rhel8.disabled @@ -13,7 +13,7 @@ content: enabled: false mirror: true mirror_manifest_list: true - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_PREVIOUS}-ci-build-root-multi-openshift-{MAJOR}.{MINOR} + upstream_image: registry.ci.openshift.org/openshift/release:rhel-8-release-golang-{GO_PREVIOUS}-openshift-{MAJOR}.{MINOR} from: member: ci-openshift-golang-builder-previous.rhel8 labels: diff --git a/images/ci-openshift-build-root-previous.rhel9.disabled b/images/ci-openshift-build-root-previous.rhel9.disabled index c8242bb370..06158b6bec 100644 --- a/images/ci-openshift-build-root-previous.rhel9.disabled +++ b/images/ci-openshift-build-root-previous.rhel9.disabled @@ -13,7 +13,7 @@ content: enabled: false mirror: true mirror_manifest_list: true - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_PREVIOUS}-ci-build-root-multi-openshift-{MAJOR}.{MINOR} + upstream_image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-{GO_PREVIOUS}-openshift-{MAJOR}.{MINOR} from: member: ci-openshift-golang-builder-previous.rhel9 labels: diff --git a/images/ci-openshift-golang-builder-latest.rhel8.yml b/images/ci-openshift-golang-builder-latest.rhel8.yml index 28b9825031..9a7f8c5ef7 100644 --- a/images/ci-openshift-golang-builder-latest.rhel8.yml +++ b/images/ci-openshift-golang-builder-latest.rhel8.yml @@ -13,7 +13,10 @@ content: enabled: false mirror: true mirror_manifest_list: true - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_LATEST}-builder-multi-openshift-{MAJOR}.{MINOR} + upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR} + upstream_image_mirror: + - registry.ci.openshift.org/ocp-private/builder-priv:rhel-8-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR} + from: stream: rhel-8-golang-{GO_LATEST} labels: diff --git a/images/ci-openshift-golang-builder-latest.rhel9.yml b/images/ci-openshift-golang-builder-latest.rhel9.yml index 0455eba218..7d78f80625 100644 --- a/images/ci-openshift-golang-builder-latest.rhel9.yml +++ b/images/ci-openshift-golang-builder-latest.rhel9.yml @@ -13,7 +13,10 @@ content: enabled: false mirror: true mirror_manifest_list: true - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_LATEST}-builder-multi-openshift-{MAJOR}.{MINOR} + upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR} + upstream_image_mirror: + - registry.ci.openshift.org/ocp-private/builder-priv:rhel-9-golang-{GO_LATEST}-openshift-{MAJOR}.{MINOR} + from: stream: rhel-9-golang-{GO_LATEST} labels: diff --git a/images/ci-openshift-golang-builder-previous.rhel8.disabled b/images/ci-openshift-golang-builder-previous.rhel8.disabled index 756819d41a..337d267182 100644 --- a/images/ci-openshift-golang-builder-previous.rhel8.disabled +++ b/images/ci-openshift-golang-builder-previous.rhel8.disabled @@ -13,7 +13,10 @@ content: enabled: false mirror: true mirror_manifest_list: true - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_PREVIOUS}-builder-multi-openshift-{MAJOR}.{MINOR} + upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-{GO_PREVIOUS}-openshift-{MAJOR}.{MINOR} + upstream_image_mirror: + - registry.ci.openshift.org/ocp-private/builder-priv:rhel-8-golang-{GO_PREVIOUS}-openshift-{MAJOR}.{MINOR} + from: stream: rhel-8-golang-{GO_PREVIOUS} labels: diff --git a/images/ci-openshift-golang-builder-previous.rhel9.disabled b/images/ci-openshift-golang-builder-previous.rhel9.disabled index cdb3618643..efcc2ae158 100644 --- a/images/ci-openshift-golang-builder-previous.rhel9.disabled +++ b/images/ci-openshift-golang-builder-previous.rhel9.disabled @@ -13,7 +13,10 @@ content: enabled: false mirror: true mirror_manifest_list: true - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_PREVIOUS}-builder-multi-openshift-{MAJOR}.{MINOR} + upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-{GO_PREVIOUS}-openshift-{MAJOR}.{MINOR} + upstream_image_mirror: + - registry.ci.openshift.org/ocp-private/builder-priv:rhel-9-golang-{GO_PREVIOUS}-openshift-{MAJOR}.{MINOR} + from: stream: rhel-9-golang-{GO_PREVIOUS} labels: diff --git a/images/golang-github-openshift-oauth-proxy.yml b/images/golang-github-openshift-oauth-proxy.yml index 9e64b705a7..547307327b 100644 --- a/images/golang-github-openshift-oauth-proxy.yml +++ b/images/golang-github-openshift-oauth-proxy.yml @@ -19,7 +19,7 @@ for_payload: true from: builder: - stream: rhel-9-golang - member: openshift-base-rhel9 + member: openshift-enterprise-base-rhel9 labels: License: GPLv2+ io.k8s.description: OpenShift OAuth Proxy. diff --git a/images/ironic-agent.yml b/images/ironic-agent.yml index a7dbc05c84..02ab91888d 100644 --- a/images/ironic-agent.yml +++ b/images/ironic-agent.yml @@ -29,7 +29,7 @@ delivery: repo_name: ose-ironic-agent for_payload: true from: - member: openshift-base-rhel9 + member: openshift-enterprise-base-rhel9 name: openshift/ose-ironic-agent-rhel9 payload_name: ironic-agent owners: diff --git a/images/ironic-rhcos-downloader.yml b/images/ironic-rhcos-downloader.yml index 0f9e7fcca7..90c184f7e6 100644 --- a/images/ironic-rhcos-downloader.yml +++ b/images/ironic-rhcos-downloader.yml @@ -27,7 +27,7 @@ for_payload: true from: builder: - stream: rhel-9-golang - member: openshift-base-rhel9 + member: openshift-enterprise-base-rhel9 name: openshift/ose-ironic-machine-os-downloader-rhel9 payload_name: ironic-machine-os-downloader owners: diff --git a/images/ironic-static-ip-manager.yml b/images/ironic-static-ip-manager.yml index ce1f0ed9cd..4f388a9816 100644 --- a/images/ironic-static-ip-manager.yml +++ b/images/ironic-static-ip-manager.yml @@ -20,7 +20,7 @@ enabled_repos: - rhel-9-baseos-rpms for_payload: true from: - member: openshift-base-rhel9 + member: openshift-enterprise-base-rhel9 name: openshift/ose-ironic-static-ip-manager-rhel9 payload_name: ironic-static-ip-manager owners: diff --git a/images/ironic.yml b/images/ironic.yml index d58128cdc4..7ba9f0463d 100644 --- a/images/ironic.yml +++ b/images/ironic.yml @@ -36,8 +36,8 @@ enabled_repos: for_payload: true from: builder: - - member: openshift-base-rhel9 - member: openshift-base-rhel9 + - member: openshift-enterprise-base-rhel9 + member: openshift-enterprise-base-rhel9 name: openshift/ose-ironic-rhel9 payload_name: ironic owners: diff --git a/images/openshift-enterprise-base-rhel9.yml b/images/openshift-enterprise-base-rhel9.yml index 9679fabae4..635902bab2 100644 --- a/images/openshift-enterprise-base-rhel9.yml +++ b/images/openshift-enterprise-base-rhel9.yml @@ -15,30 +15,6 @@ content: - approved - lgtm merge_first: true - # The OpenShift 4.x:base image used by numerous images in CI. - # The problem is that the actual image is built upstream very infrequently - # (very few changes are made to the openshift/images repo). - # So the "normal" CI promotion logic that updates 4.x:base almost never runs. - # This means that the 4.x:base image diverges over time from the UBI content - # that ART is constantly updating its images with. We want 4.x:base to be - # very similar to what we are using downstream so that CI signal represents - # the downstream product. - mirror: true - # The upstream_image_base serves as a starting point for the upstream_image. - # ART will mirror the brew build out to upstream_image_base. - # ART does not mirror the upstream_image in this case. A buildconfig, - # generated by images:streams is triggered when upstream_image_base is updated. - # The output of this buildconfig is upstream_image. - # This buildconfig layers on files necessary for the resulting upstream_image CI image - # to pull RPM dependencies from the CDN & reposync repositories. - upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-9-openshift-enterprise-base-{MAJOR}.{MINOR}.art - # Note that it must be qualified by {MAJOR}.{MINOR} so that it installs non-CDN - # rpms for the appropriate release. - transform: rhel-9/base-repos - # After the transform, promote directly to the location that CI promotes to. This is - # a little sketchy, but I believe the reward is a significant improvement in CI - # signal fidelity. - upstream_image: registry.ci.openshift.org/ocp/{MAJOR}.{MINOR}:base-rhel9 okd_alignment: # The tag name in the okd stream to which this image should be promoted tag_name: base-stream9 diff --git a/images/openshift-enterprise-builder.yml b/images/openshift-enterprise-builder.yml index 5267587b88..2a562bb906 100644 --- a/images/openshift-enterprise-builder.yml +++ b/images/openshift-enterprise-builder.yml @@ -24,7 +24,7 @@ for_payload: true from: builder: - stream: rhel-9-golang - member: openshift-base-rhel9 + member: openshift-enterprise-base-rhel9 labels: License: GPLv2+ io.k8s.description: This is a component of OpenShift Container Platform and is responsible for executing container image builds. diff --git a/images/ose-cluster-samples-operator.yml b/images/ose-cluster-samples-operator.yml index e979e85ac1..8a73188568 100644 --- a/images/ose-cluster-samples-operator.yml +++ b/images/ose-cluster-samples-operator.yml @@ -21,7 +21,7 @@ for_payload: true from: builder: - stream: rhel-9-golang - member: openshift-base-rhel9 + member: openshift-enterprise-base-rhel9 name: openshift/ose-cluster-samples-rhel9-operator payload_name: cluster-samples-operator owners: diff --git a/images/ose-frr.yml b/images/ose-frr.yml index 625183b1dc..df82616e9c 100644 --- a/images/ose-frr.yml +++ b/images/ose-frr.yml @@ -22,7 +22,7 @@ dependents: from: builder: - stream: rhel-9-golang - member: openshift-base-rhel9 + member: openshift-enterprise-base-rhel9 name: openshift/frr-rhel9 name_in_bundle: metallb-frr-rhel9 payload_name: metallb-frr diff --git a/images/ose-metallb-operator.yml b/images/ose-metallb-operator.yml index 9184ddcda9..0ac6a0cfdd 100644 --- a/images/ose-metallb-operator.yml +++ b/images/ose-metallb-operator.yml @@ -23,7 +23,7 @@ for_payload: false from: builder: - stream: rhel-9-golang - member: openshift-base-rhel9 + member: openshift-enterprise-base-rhel9 owners: - metallb-dev@redhat.com update-csv: diff --git a/images/ose-metallb.yml b/images/ose-metallb.yml index 11d79e52c6..463ee86cef 100644 --- a/images/ose-metallb.yml +++ b/images/ose-metallb.yml @@ -22,7 +22,7 @@ for_payload: false from: builder: - stream: rhel-9-golang - member: openshift-base-rhel9 + member: openshift-enterprise-base-rhel9 name: openshift/metallb-rhel9 name_in_bundle: metallb-rhel9 owners: diff --git a/streams.yml b/streams.yml index db7aaadc35..16da18184b 100644 --- a/streams.yml +++ b/streams.yml @@ -22,52 +22,24 @@ rhel-8-golang-1.21: - rhel-8-golang-{GO_PREVIOUS} image: openshift/golang-builder:v1.21.11-202407021847.g1ac3e39.el8 mirror: false - transform: rhel-8/golang - # Leave this upstream information in place even if mirror/transform is disabled. Test Platform read the data. - upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-{MAJOR}.{MINOR}.art - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-{MAJOR}.{MINOR} - # To ensure consistency in our builds and allow CI to use the same build, mirror the upstream builder image from ocp/builder to ocp-private/builder-priv. - upstream_image_mirror: - - registry.ci.openshift.org/ocp-private/builder-priv:rhel-8-golang-1.21-openshift-{MAJOR}.{MINOR} rhel-9-golang-1.21: aliases: - rhel-9-golang-{GO_PREVIOUS} image: openshift/golang-builder:v1.21.11-202407030000.gab74a9a.el9 mirror: false - transform: rhel-9/golang - # Leave this upstream information in place even if mirror/transform is disabled. Test Platform read the data. - upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-{MAJOR}.{MINOR}.art - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-{MAJOR}.{MINOR} - # To ensure consistency in our builds and allow CI to use the same build, mirror the upstream builder image from ocp/builder to ocp-private/builder-priv. - upstream_image_mirror: - - registry.ci.openshift.org/ocp-private/builder-priv:rhel-9-golang-1.21-openshift-{MAJOR}.{MINOR} rhel-9-golang: aliases: - rhel-9-golang-{GO_LATEST} image: openshift/golang-builder:v1.22.7-202410111609.gc451559.el9 - mirror: true - transform: rhel-9/golang - # Leave this upstream information in place even if mirror/transform is disabled. Test Platform read the data. - upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-{MAJOR}.{MINOR}.art - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-{MAJOR}.{MINOR} - # To ensure consistency in our builds and allow CI to use the same build, mirror the upstream builder image from ocp/builder to ocp-private/builder-priv. - upstream_image_mirror: - - registry.ci.openshift.org/ocp-private/builder-priv:rhel-9-golang-1.22-openshift-{MAJOR}.{MINOR} + mirror: false rhel-8-golang: aliases: - rhel-8-golang-{GO_LATEST} image: openshift/golang-builder:v1.22.7-202410111416.gd54e8ac.el8 - mirror: true - transform: rhel-8/golang - # Leave this upstream information in place even if mirror/transform is disabled. Test Platform read the data. - upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-{MAJOR}.{MINOR}.art - upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-{MAJOR}.{MINOR} - # To ensure consistency in our builds and allow CI to use the same build, mirror the upstream builder image from ocp/builder to ocp-private/builder-priv. - upstream_image_mirror: - - registry.ci.openshift.org/ocp-private/builder-priv:rhel-8-golang-1.22-openshift-{MAJOR}.{MINOR} + mirror: false partner-rhel-8-golang-1.22: image: openshift/golang-builder:v1.22.7-202410111416.gd54e8ac.el8 @@ -85,51 +57,13 @@ partner-rhel-9-golang-1.22: upstream_image_mirror: - quay.io/openshift-release-dev/golang-builder--ibm-share:rhel-9-golang-1.22-openshift-{MAJOR}.{MINOR} -# This image is not used by ART. It is an artifact required in upstream CI to build unit tests. -# Our transform is designed to create a buildconfig atop a specific golang version, layering on -# packages that upstream has traditionally had present in its build_roots. -rhel-8-golang-1.21-ci-build-root: - mirror: false - image: not_applicable - upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-{MAJOR}.{MINOR} - transform: rhel-8/ci-build-root - upstream_image: registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-{MAJOR}.{MINOR} - -# This image is not used by ART. It is an artifact required in upstream CI to build unit tests. -# Our transform is designed to create a buildconfig atop a specific golang version, layering on -# packages that upstream has traditionally had present in its build_roots. -rhel-8-golang-ci-build-root: - image: not_applicable - upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-{MAJOR}.{MINOR} - transform: rhel-8/ci-build-root - upstream_image: registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-{MAJOR}.{MINOR} - -# This image is not used by ART. It is an artifact required in upstream CI to build unit tests. -# Our transform is designed to create a buildconfig atop a specific golang version, layering on -# packages that upstream has traditionally had present in its build_roots. -rhel-9-golang-ci-build-root: - image: not_applicable - upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-{MAJOR}.{MINOR} - transform: rhel-9/ci-build-root - upstream_image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-{MAJOR}.{MINOR} - -# This image is not used by ART. It is an artifact required in upstream CI to build unit tests. -# Our transform is designed to create a buildconfig atop a specific golang version, layering on -# packages that upstream has traditionally had present in its build_roots. -rhel-9-golang-1.21-ci-build-root: - mirror: false - image: not_applicable - upstream_image_base: registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-{MAJOR}.{MINOR} - transform: rhel-9/ci-build-root - upstream_image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.21-openshift-{MAJOR}.{MINOR} - rhel8: # the most recent release at present. since we yum update this, it does not need to float. # it is important that we not build from unreleased builds and publish them. # ubi8-container-8.10-901.1717584420 image: registry-proxy.engineering.redhat.com/rh-osbs/ubi8@sha256:143123d85045df426c5bbafc6863659880ebe276eb02c77ee868b88d08dbd05d upstream_image: registry.ci.openshift.org/ocp/builder:rhel-8-openshift-{MAJOR}.{MINOR}.art - mirror: true + mirror: false rhel9: # the most recent release at present. since we yum update this, it does not need to float. @@ -137,7 +71,7 @@ rhel9: # rhel-els-container-9.4-847.1719484506 image: registry-proxy.engineering.redhat.com/rh-osbs/rhel-els@sha256:0a4a4ab60ce8abac3edab51cacdbed25cd012a3e4169895bce2d18ed74364e08 upstream_image: registry.ci.openshift.org/ocp/builder:rhel-9-openshift-{MAJOR}.{MINOR}.art - mirror: true + mirror: false nodejs-rhel9: image: registry-proxy.engineering.redhat.com/rh-osbs/ubi9-nodejs-18:1-98