From 94313bf4a2bc5c9ff449a6793d9f6977e1d7a407 Mon Sep 17 00:00:00 2001 From: Prucek Date: Thu, 8 Jan 2026 16:11:03 +0100 Subject: [PATCH] openshift/origin: remove autodetectable inputs and base_images --- .../origin/openshift-origin-main.yaml | 26 ------------------- .../openshift-origin-main__okd-scos.yaml | 9 ------- .../origin/openshift-origin-release-4.10.yaml | 19 -------------- .../origin/openshift-origin-release-4.11.yaml | 19 -------------- .../origin/openshift-origin-release-4.12.yaml | 19 -------------- .../origin/openshift-origin-release-4.13.yaml | 12 --------- .../origin/openshift-origin-release-4.14.yaml | 12 --------- .../origin/openshift-origin-release-4.15.yaml | 26 ------------------- .../origin/openshift-origin-release-4.16.yaml | 19 -------------- ...enshift-origin-release-4.16__okd-scos.yaml | 9 ------- .../origin/openshift-origin-release-4.17.yaml | 19 -------------- ...enshift-origin-release-4.17__okd-scos.yaml | 9 ------- .../origin/openshift-origin-release-4.18.yaml | 26 ------------------- ...enshift-origin-release-4.18__okd-scos.yaml | 9 ------- .../origin/openshift-origin-release-4.19.yaml | 26 ------------------- ...enshift-origin-release-4.19__okd-scos.yaml | 9 ------- .../origin/openshift-origin-release-4.20.yaml | 26 ------------------- ...enshift-origin-release-4.20__okd-scos.yaml | 9 ------- .../origin/openshift-origin-release-4.21.yaml | 26 ------------------- ...enshift-origin-release-4.21__okd-scos.yaml | 9 ------- .../origin/openshift-origin-release-4.22.yaml | 26 ------------------- .../origin/openshift-origin-release-4.23.yaml | 26 ------------------- .../origin/openshift-origin-release-4.6.yaml | 8 ------ .../origin/openshift-origin-release-4.7.yaml | 12 --------- .../origin/openshift-origin-release-4.8.yaml | 19 -------------- .../origin/openshift-origin-release-4.9.yaml | 19 -------------- 26 files changed, 448 deletions(-) diff --git a/ci-operator/config/openshift/origin/openshift-origin-main.yaml b/ci-operator/config/openshift/origin/openshift-origin-main.yaml index b26eade18b41e..162f3a49e5b4c 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-main.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-main.yaml @@ -15,18 +15,6 @@ base_images: name: hypershift-operator namespace: hypershift tag: latest - ocp_4.16_base-rhel9: - name: "4.22" - namespace: ocp - tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.17 - ocp_builder_rhel-9-golang-1.24-openshift-4.22: - name: builder - namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.22 tools: name: "4.22" namespace: ocp @@ -37,22 +25,8 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 - ocp_builder_rhel-9-golang-1.24-openshift-4.22: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel - inputs: - ocp_4.16_base-rhel9: - as: - - registry.ci.openshift.org/ocp/4.16:base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-main__okd-scos.yaml b/ci-operator/config/openshift/origin/openshift-origin-main__okd-scos.yaml index dd59fd69865a3..e8039dc0c02f4 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-main__okd-scos.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-main__okd-scos.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-9-golang-1.24-openshift-4.22: - name: builder - namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.22 origin_scos-4.22_tools: name: scos-4.22 namespace: origin @@ -18,11 +14,6 @@ images: value: scos dockerfile_path: images/tests/Dockerfile.rhel from: origin_scos-4.22_tools - inputs: - ocp_builder_rhel-9-golang-1.24-openshift-4.22: - as: - - builder - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 to: tests promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.10.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.10.yaml index 5413be7920591..00cd954f457b9 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.10.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.10.yaml @@ -7,14 +7,6 @@ base_images: name: test namespace: ocp-kni tag: dev-scripts - ocp_builder_rhel-8-golang-1.15-openshift-4.8: - name: builder - namespace: ocp - tag: rhel-8-golang-1.15-openshift-4.8 - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - name: builder - namespace: ocp - tag: rhel-8-golang-1.17-openshift-4.10 tools: name: "4.10" namespace: ocp @@ -25,20 +17,9 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-8-golang-1.15-openshift-4.8: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 - ocp_builder_rhel-8-golang-1.17-openshift-4.10: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel from: base - inputs: - ocp_builder_rhel-8-golang-1.15-openshift-4.8: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.11.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.11.yaml index 98bcb57f0b39f..c79ab560d700f 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.11.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.11.yaml @@ -7,14 +7,6 @@ base_images: name: golangci-lint namespace: ci tag: v1.46.0 - ocp_builder_rhel-8-golang-1.15-openshift-4.8: - name: builder - namespace: ocp - tag: rhel-8-golang-1.15-openshift-4.8 - ocp_builder_rhel-8-golang-1.18-openshift-4.11: - name: builder - namespace: ocp - tag: rhel-8-golang-1.18-openshift-4.11 tools: name: "4.11" namespace: ocp @@ -25,20 +17,9 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-8-golang-1.15-openshift-4.8: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 - ocp_builder_rhel-8-golang-1.18-openshift-4.11: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel from: base - inputs: - ocp_builder_rhel-8-golang-1.15-openshift-4.8: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.12.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.12.yaml index 04991866fce93..600612f429a2e 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.12.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.12.yaml @@ -11,14 +11,6 @@ base_images: name: golangci-lint namespace: ci tag: v1.46.0 - ocp_builder_rhel-8-golang-1.15-openshift-4.8: - name: builder - namespace: ocp - tag: rhel-8-golang-1.15-openshift-4.8 - ocp_builder_rhel-8-golang-1.19-openshift-4.12: - name: builder - namespace: ocp - tag: rhel-8-golang-1.19-openshift-4.12 tools: name: "4.12" namespace: ocp @@ -29,20 +21,9 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-8-golang-1.15-openshift-4.8: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 - ocp_builder_rhel-8-golang-1.19-openshift-4.12: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.12 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel from: base - inputs: - ocp_builder_rhel-8-golang-1.15-openshift-4.8: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.13.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.13.yaml index 3a23d55cd4007..90b0307cfe92e 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.13.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.13.yaml @@ -11,10 +11,6 @@ base_images: name: golangci-lint namespace: ci tag: v1.46.0 - ocp_builder_rhel-8-golang-1.19-openshift-4.13: - name: builder - namespace: ocp - tag: rhel-8-golang-1.19-openshift-4.13 tools: name: "4.13" namespace: ocp @@ -25,17 +21,9 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-8-golang-1.19-openshift-4.13: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.13 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel from: base - inputs: - ocp_builder_rhel-8-golang-1.19-openshift-4.13: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.13 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.14.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.14.yaml index 05a7b2d5f9c6c..b1de9d8e8d2f9 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.14.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.14.yaml @@ -11,10 +11,6 @@ base_images: name: golangci-lint namespace: ci tag: v1.46.0 - ocp_builder_rhel-8-golang-1.20-openshift-4.14: - name: builder - namespace: ocp - tag: rhel-8-golang-1.20-openshift-4.14 tools: name: "4.14" namespace: ocp @@ -25,17 +21,9 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-8-golang-1.20-openshift-4.14: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel from: base - inputs: - ocp_builder_rhel-8-golang-1.20-openshift-4.14: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.15.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.15.yaml index 5dbca0e246559..5312a4ce49e11 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.15.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.15.yaml @@ -11,18 +11,6 @@ base_images: name: hypershift-operator namespace: hypershift tag: latest - ocp_4.14_base: - name: "4.14" - namespace: ocp - tag: base - ocp_builder_rhel-8-golang-1.20-openshift-4.14: - name: builder - namespace: ocp - tag: rhel-8-golang-1.20-openshift-4.14 - ocp_builder_rhel-8-golang-1.20-openshift-4.15: - name: builder - namespace: ocp - tag: rhel-8-golang-1.20-openshift-4.15 tools: name: "4.15" namespace: ocp @@ -33,22 +21,8 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-8-golang-1.20-openshift-4.14: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 - ocp_builder_rhel-8-golang-1.20-openshift-4.15: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel - inputs: - ocp_4.14_base: - as: - - registry.ci.openshift.org/ocp/4.14:base - ocp_builder_rhel-8-golang-1.20-openshift-4.14: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml index 89fdb9d428b33..9c68706afa571 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml @@ -15,14 +15,6 @@ base_images: name: hypershift-operator namespace: hypershift tag: latest - ocp_4.16_base-rhel9: - name: "4.16" - namespace: ocp - tag: base-rhel9 - ocp_builder_rhel-9-golang-1.21-openshift-4.16: - name: builder - namespace: ocp - tag: rhel-9-golang-1.21-openshift-4.16 tools: name: "4.16" namespace: ocp @@ -33,19 +25,8 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-9-golang-1.21-openshift-4.16: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel - inputs: - ocp_4.16_base-rhel9: - as: - - registry.ci.openshift.org/ocp/4.16:base-rhel9 - ocp_builder_rhel-9-golang-1.21-openshift-4.16: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.16__okd-scos.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.16__okd-scos.yaml index fdc01bd29cfc9..e028ffc8b7686 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.16__okd-scos.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.16__okd-scos.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-9-golang-1.21-openshift-4.16: - name: builder - namespace: ocp - tag: rhel-9-golang-1.21-openshift-4.16 origin_scos-4.16_tools: name: scos-4.16 namespace: origin @@ -18,11 +14,6 @@ images: value: scos dockerfile_path: images/tests/Dockerfile.rhel from: origin_scos-4.16_tools - inputs: - ocp_builder_rhel-9-golang-1.21-openshift-4.16: - as: - - builder - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 to: tests promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.17.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.17.yaml index 75a0d40f6aea4..079baee517402 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.17.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.17.yaml @@ -11,14 +11,6 @@ base_images: name: hypershift-operator namespace: hypershift tag: latest - ocp_4.16_base-rhel9: - name: "4.17" - namespace: ocp - tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.17 tools: name: "4.17" namespace: ocp @@ -29,19 +21,8 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel - inputs: - ocp_4.16_base-rhel9: - as: - - registry.ci.openshift.org/ocp/4.16:base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.17__okd-scos.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.17__okd-scos.yaml index 0f94840eb1f09..2c0ec6dbf8f68 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.17__okd-scos.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.17__okd-scos.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.17 origin_scos-4.17_tools: name: scos-4.17 namespace: origin @@ -18,11 +14,6 @@ images: value: scos dockerfile_path: images/tests/Dockerfile.rhel from: origin_scos-4.17_tools - inputs: - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - builder - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 to: tests promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.18.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.18.yaml index 8bdeab63ba494..1936a76c2be84 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.18.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.18.yaml @@ -15,18 +15,6 @@ base_images: name: hypershift-operator namespace: hypershift tag: latest - ocp_4.16_base-rhel9: - name: "4.18" - namespace: ocp - tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.17 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.18 tools: name: "4.18" namespace: ocp @@ -37,22 +25,8 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 - ocp_builder_rhel-9-golang-1.22-openshift-4.18: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel - inputs: - ocp_4.16_base-rhel9: - as: - - registry.ci.openshift.org/ocp/4.16:base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.18__okd-scos.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.18__okd-scos.yaml index ac57438971431..83467714eb98f 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.18__okd-scos.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.18__okd-scos.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-9-golang-1.22-openshift-4.18: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.18 origin_scos-4.18_tools: name: scos-4.18 namespace: origin @@ -18,11 +14,6 @@ images: value: scos dockerfile_path: images/tests/Dockerfile.rhel from: origin_scos-4.18_tools - inputs: - ocp_builder_rhel-9-golang-1.22-openshift-4.18: - as: - - builder - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 to: tests promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.19.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.19.yaml index 22499c50ddc1f..f81a250a56257 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.19.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.19.yaml @@ -15,18 +15,6 @@ base_images: name: hypershift-operator namespace: hypershift tag: latest - ocp_4.16_base-rhel9: - name: "4.19" - namespace: ocp - tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.17 - ocp_builder_rhel-9-golang-1.23-openshift-4.19: - name: builder - namespace: ocp - tag: rhel-9-golang-1.23-openshift-4.19 tools: name: "4.19" namespace: ocp @@ -37,22 +25,8 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 - ocp_builder_rhel-9-golang-1.23-openshift-4.19: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel - inputs: - ocp_4.16_base-rhel9: - as: - - registry.ci.openshift.org/ocp/4.16:base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.19__okd-scos.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.19__okd-scos.yaml index d52b1d58d7c26..5a47caca3c5b6 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.19__okd-scos.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.19__okd-scos.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-9-golang-1.23-openshift-4.19: - name: builder - namespace: ocp - tag: rhel-9-golang-1.23-openshift-4.19 origin_scos-4.19_tools: name: scos-4.19 namespace: origin @@ -18,11 +14,6 @@ images: value: scos dockerfile_path: images/tests/Dockerfile.rhel from: origin_scos-4.19_tools - inputs: - ocp_builder_rhel-9-golang-1.23-openshift-4.19: - as: - - builder - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 to: tests promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.20.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.20.yaml index 37f3f5ab05c54..901bcb5454ac9 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.20.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.20.yaml @@ -15,18 +15,6 @@ base_images: name: hypershift-operator namespace: hypershift tag: latest - ocp_4.16_base-rhel9: - name: "4.20" - namespace: ocp - tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.17 - ocp_builder_rhel-9-golang-1.24-openshift-4.20: - name: builder - namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.20 tools: name: "4.20" namespace: ocp @@ -37,22 +25,8 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 - ocp_builder_rhel-9-golang-1.24-openshift-4.20: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel - inputs: - ocp_4.16_base-rhel9: - as: - - registry.ci.openshift.org/ocp/4.16:base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.20__okd-scos.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.20__okd-scos.yaml index a0538815cf248..29fbdfe3ff397 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.20__okd-scos.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.20__okd-scos.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-9-golang-1.24-openshift-4.20: - name: builder - namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.20 origin_scos-4.20_tools: name: scos-4.20 namespace: origin @@ -18,11 +14,6 @@ images: value: scos dockerfile_path: images/tests/Dockerfile.rhel from: origin_scos-4.20_tools - inputs: - ocp_builder_rhel-9-golang-1.24-openshift-4.20: - as: - - builder - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 to: tests promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.21.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.21.yaml index 59568fd2a9984..7997711cbf6eb 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.21.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.21.yaml @@ -15,18 +15,6 @@ base_images: name: hypershift-operator namespace: hypershift tag: latest - ocp_4.16_base-rhel9: - name: "4.21" - namespace: ocp - tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.17 - ocp_builder_rhel-9-golang-1.24-openshift-4.21: - name: builder - namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.21 tools: name: "4.21" namespace: ocp @@ -37,22 +25,8 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 - ocp_builder_rhel-9-golang-1.24-openshift-4.21: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel - inputs: - ocp_4.16_base-rhel9: - as: - - registry.ci.openshift.org/ocp/4.16:base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.21__okd-scos.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.21__okd-scos.yaml index 65743f4dfb4c2..3206c3fa274d4 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.21__okd-scos.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.21__okd-scos.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-9-golang-1.24-openshift-4.21: - name: builder - namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.21 origin_scos-4.21_tools: name: scos-4.21 namespace: origin @@ -18,11 +14,6 @@ images: value: scos dockerfile_path: images/tests/Dockerfile.rhel from: origin_scos-4.21_tools - inputs: - ocp_builder_rhel-9-golang-1.24-openshift-4.21: - as: - - builder - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 to: tests promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml index 9de9c8d1efb1c..455bfee160bfa 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml @@ -15,18 +15,6 @@ base_images: name: hypershift-operator namespace: hypershift tag: latest - ocp_4.16_base-rhel9: - name: "4.22" - namespace: ocp - tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.17 - ocp_builder_rhel-9-golang-1.24-openshift-4.22: - name: builder - namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.22 tools: name: "4.22" namespace: ocp @@ -37,22 +25,8 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 - ocp_builder_rhel-9-golang-1.24-openshift-4.22: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel - inputs: - ocp_4.16_base-rhel9: - as: - - registry.ci.openshift.org/ocp/4.16:base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.23.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.23.yaml index 3f8c1a4dcc14a..b7a5b4042330d 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.23.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.23.yaml @@ -15,18 +15,6 @@ base_images: name: hypershift-operator namespace: hypershift tag: latest - ocp_4.16_base-rhel9: - name: "4.23" - namespace: ocp - tag: base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - name: builder - namespace: ocp - tag: rhel-9-golang-1.22-openshift-4.17 - ocp_builder_rhel-9-golang-1.24-openshift-4.22: - name: builder - namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.22 tools: name: "4.23" namespace: ocp @@ -37,22 +25,8 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 - ocp_builder_rhel-9-golang-1.24-openshift-4.22: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel - inputs: - ocp_4.16_base-rhel9: - as: - - registry.ci.openshift.org/ocp/4.16:base-rhel9 - ocp_builder_rhel-9-golang-1.22-openshift-4.17: - as: - - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.6.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.6.yaml index 91636f84c7579..91456ab4e2225 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.6.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.6.yaml @@ -1,8 +1,4 @@ base_images: - ocp_builder_rhel-8-golang-1.15-openshift-4.6: - name: builder - namespace: ocp - tag: rhel-8-golang-1.15-openshift-4.6 tools: name: "4.6" namespace: ocp @@ -16,10 +12,6 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-8-golang-1.15-openshift-4.6: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 to: tests promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.7.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.7.yaml index a3d0052006cd2..72eafa3fd5e97 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.7.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.7.yaml @@ -3,10 +3,6 @@ base_images: name: "4.7" namespace: ocp tag: base - ocp_builder_rhel-8-golang-1.15-openshift-4.7: - name: builder - namespace: ocp - tag: rhel-8-golang-1.15-openshift-4.7 tools: name: "4.7" namespace: ocp @@ -20,17 +16,9 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-8-golang-1.15-openshift-4.7: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel from: base - inputs: - ocp_builder_rhel-8-golang-1.15-openshift-4.7: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.8.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.8.yaml index cff50e39525a4..5d8fcbfd56f53 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.8.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.8.yaml @@ -7,14 +7,6 @@ base_images: name: test namespace: ocp-kni tag: dev-scripts - ocp_builder_rhel-8-golang-1.15-openshift-4.8: - name: builder - namespace: ocp - tag: rhel-8-golang-1.15-openshift-4.8 - ocp_builder_rhel-8-golang-1.16-openshift-4.8: - name: builder - namespace: ocp - tag: rhel-8-golang-1.16-openshift-4.8 tools: name: "4.8" namespace: ocp @@ -28,20 +20,9 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-8-golang-1.15-openshift-4.8: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 - ocp_builder_rhel-8-golang-1.16-openshift-4.8: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel from: base - inputs: - ocp_builder_rhel-8-golang-1.15-openshift-4.8: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 to: hello-openshift promotion: to: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.9.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.9.yaml index 7f4611c027416..727c197c9911d 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.9.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.9.yaml @@ -7,14 +7,6 @@ base_images: name: test namespace: ocp-kni tag: dev-scripts - ocp_builder_rhel-8-golang-1.15-openshift-4.8: - name: builder - namespace: ocp - tag: rhel-8-golang-1.15-openshift-4.8 - ocp_builder_rhel-8-golang-1.16-openshift-4.9: - name: builder - namespace: ocp - tag: rhel-8-golang-1.16-openshift-4.9 tools: name: "4.9" namespace: ocp @@ -28,20 +20,9 @@ build_root: images: - dockerfile_path: images/tests/Dockerfile.rhel from: tools - inputs: - ocp_builder_rhel-8-golang-1.15-openshift-4.8: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 - ocp_builder_rhel-8-golang-1.16-openshift-4.9: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel from: base - inputs: - ocp_builder_rhel-8-golang-1.15-openshift-4.8: - as: - - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8 to: hello-openshift promotion: to: