diff --git a/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-main.yaml b/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-main.yaml index 9c8e2c7bf33e..fabaa1d57c25 100644 --- a/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-main.yaml +++ b/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-main.yaml @@ -1,8 +1,16 @@ base_images: - nginx-120: - name: nginx + go-builder-base: + name: release namespace: openshift - tag: 1.20-ubi9 + tag: rhel-9-release-golang-1.20-openshift-4.14 + ubi9-minimal-base: + name: ubi-minimal + namespace: ocp + tag: "9" + web-builder-base: + name: ubi-minimal + namespace: ocp + tag: "9" build_root: image_stream_tag: name: release @@ -12,7 +20,14 @@ images: - dockerfile_path: Dockerfile.cypress to: plugin-test - dockerfile_path: Dockerfile.ci - from: nginx-120 + from: ubi9-minimal-base + inputs: + go-builder-base: + as: + - registry.redhat.io/ubi9/go-toolset:1.19 + web-builder-base: + as: + - registry.redhat.io/ubi9/ubi-minimal to: logging-view-plugin promotion: name: 5.y diff --git a/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-release-5.6.yaml b/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-release-5.6.yaml index fe6d5a68ff75..cce716feb717 100644 --- a/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-release-5.6.yaml +++ b/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-release-5.6.yaml @@ -1,18 +1,33 @@ base_images: - nginx-120: - name: nginx + go-builder-base: + name: release namespace: openshift - tag: 1.20-ubi9 + tag: rhel-9-release-golang-1.20-openshift-4.14 + ubi9-minimal-base: + name: ubi-minimal + namespace: ocp + tag: "9" + web-builder-base: + name: ubi-minimal + namespace: ocp + tag: "9" build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-8-release-golang-1.17-openshift-4.10 + tag: rhel-9-release-golang-1.20-openshift-4.14 images: - dockerfile_path: Dockerfile.cypress to: plugin-test - dockerfile_path: Dockerfile.ci - from: nginx-120 + from: ubi9-minimal-base + inputs: + go-builder-base: + as: + - registry.redhat.io/ubi9/go-toolset:1.19 + web-builder-base: + as: + - registry.redhat.io/ubi9/ubi-minimal to: logging-view-plugin promotion: name: "5.6" diff --git a/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-release-5.7.yaml b/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-release-5.7.yaml index a6ec608e9566..fcb6ee31d74f 100644 --- a/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-release-5.7.yaml +++ b/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-release-5.7.yaml @@ -1,18 +1,33 @@ base_images: - nginx-120: - name: nginx + go-builder-base: + name: release namespace: openshift - tag: 1.20-ubi9 + tag: rhel-9-release-golang-1.20-openshift-4.14 + ubi9-minimal-base: + name: ubi-minimal + namespace: ocp + tag: "9" + web-builder-base: + name: ubi-minimal + namespace: ocp + tag: "9" build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-8-release-golang-1.17-openshift-4.10 + tag: rhel-9-release-golang-1.20-openshift-4.14 images: - dockerfile_path: Dockerfile.cypress to: plugin-test - dockerfile_path: Dockerfile.ci - from: nginx-120 + from: ubi9-minimal-base + inputs: + go-builder-base: + as: + - registry.redhat.io/ubi9/go-toolset:1.19 + web-builder-base: + as: + - registry.redhat.io/ubi9/ubi-minimal to: logging-view-plugin promotion: name: "5.7" diff --git a/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-release-5.8.yaml b/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-release-5.8.yaml index 56f9f2da67c0..186d01fb75b9 100644 --- a/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-release-5.8.yaml +++ b/ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-release-5.8.yaml @@ -1,8 +1,16 @@ base_images: - nginx-120: - name: nginx + go-builder-base: + name: release namespace: openshift - tag: 1.20-ubi9 + tag: rhel-9-release-golang-1.20-openshift-4.14 + ubi9-minimal-base: + name: ubi-minimal + namespace: ocp + tag: "9" + web-builder-base: + name: ubi-minimal + namespace: ocp + tag: "9" build_root: image_stream_tag: name: release @@ -12,7 +20,14 @@ images: - dockerfile_path: Dockerfile.cypress to: plugin-test - dockerfile_path: Dockerfile.ci - from: nginx-120 + from: ubi9-minimal-base + inputs: + go-builder-base: + as: + - registry.redhat.io/ubi9/go-toolset:1.19 + web-builder-base: + as: + - registry.redhat.io/ubi9/ubi-minimal to: logging-view-plugin promotion: name: "5.8"