From bed271b96ffea148d49ea2f34828a56e59ae4165 Mon Sep 17 00:00:00 2001 From: Varsha B Date: Wed, 10 Jul 2024 20:41:33 +0530 Subject: [PATCH 1/6] Changing registry image to fix CI failure Signed-off-by: Varsha B --- openshift-ci/build-root/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index 58270bf6b4f..c4bf29e65ec 100644 --- a/openshift-ci/build-root/Dockerfile +++ b/openshift-ci/build-root/Dockerfile @@ -1,6 +1,6 @@ # Dockerfile to bootstrap build and test in openshift-ci -FROM registry.ci.openshift.org/openshift/release:golang-1.19 +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 ARG KUBECTL_KUTTL_VERSION=0.12.1 ARG OPERATOR_SDK_VERSION=1.22.2 From d62a128bb77fa123b1a240ce9d309b1209f81adc Mon Sep 17 00:00:00 2001 From: Varsha B Date: Wed, 10 Jul 2024 21:19:19 +0530 Subject: [PATCH 2/6] replace yum with dnf Signed-off-by: Varsha B --- openshift-ci/build-root/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index c4bf29e65ec..3e49f07a0b8 100644 --- a/openshift-ci/build-root/Dockerfile +++ b/openshift-ci/build-root/Dockerfile @@ -5,7 +5,7 @@ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 ARG KUBECTL_KUTTL_VERSION=0.12.1 ARG OPERATOR_SDK_VERSION=1.22.2 -RUN yum -y install dnf httpd-tools podman docker +RUN dnf -y install dnf httpd-tools podman docker # Install kubectl tool which is used in e2e-tests RUN curl -sSL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \ From e4c1147c4fcc27e0ff9fb1ff2e459fe508fb39c9 Mon Sep 17 00:00:00 2001 From: Varsha B Date: Wed, 10 Jul 2024 22:53:42 +0530 Subject: [PATCH 3/6] addressing review comment Signed-off-by: Varsha B --- openshift-ci/build-root/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index 3e49f07a0b8..de8a6ec94c3 100644 --- a/openshift-ci/build-root/Dockerfile +++ b/openshift-ci/build-root/Dockerfile @@ -5,7 +5,7 @@ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 ARG KUBECTL_KUTTL_VERSION=0.12.1 ARG OPERATOR_SDK_VERSION=1.22.2 -RUN dnf -y install dnf httpd-tools podman docker +RUN dnf -y install httpd-tools podman docker # Install kubectl tool which is used in e2e-tests RUN curl -sSL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \ From e4588c83e889ff6615f4a9d5352240c7826e4b0e Mon Sep 17 00:00:00 2001 From: Varsha B Date: Wed, 10 Jul 2024 23:25:19 +0530 Subject: [PATCH 4/6] addressing review comment Signed-off-by: Varsha B --- openshift-ci/build-root/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index de8a6ec94c3..e5ff5a90891 100644 --- a/openshift-ci/build-root/Dockerfile +++ b/openshift-ci/build-root/Dockerfile @@ -5,7 +5,7 @@ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 ARG KUBECTL_KUTTL_VERSION=0.12.1 ARG OPERATOR_SDK_VERSION=1.22.2 -RUN dnf -y install httpd-tools podman docker +RUN yum -y install httpd-tools podman docker # Install kubectl tool which is used in e2e-tests RUN curl -sSL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \ From f91349f70a1d1dbb5e900028b3e11d6d9751c00d Mon Sep 17 00:00:00 2001 From: Varsha B Date: Thu, 11 Jul 2024 10:51:28 +0530 Subject: [PATCH 5/6] exit safely Signed-off-by: Varsha B --- openshift-ci/build-root/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index e5ff5a90891..ea5fe277a26 100644 --- a/openshift-ci/build-root/Dockerfile +++ b/openshift-ci/build-root/Dockerfile @@ -5,7 +5,7 @@ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 ARG KUBECTL_KUTTL_VERSION=0.12.1 ARG OPERATOR_SDK_VERSION=1.22.2 -RUN yum -y install httpd-tools podman docker +RUN yum -y install httpd-tools podman docker; exit 0 # Install kubectl tool which is used in e2e-tests RUN curl -sSL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \ From dd19310fb575ef569a72a0c6bd6e3874f7d61499 Mon Sep 17 00:00:00 2001 From: Varsha B Date: Thu, 11 Jul 2024 12:55:14 +0530 Subject: [PATCH 6/6] removing yum command for package installations Signed-off-by: Varsha B --- openshift-ci/build-root/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index ea5fe277a26..2e45e871a8c 100644 --- a/openshift-ci/build-root/Dockerfile +++ b/openshift-ci/build-root/Dockerfile @@ -1,12 +1,10 @@ # Dockerfile to bootstrap build and test in openshift-ci -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 +FROM registry.ci.openshift.org/openshift/release:golang-1.21 ARG KUBECTL_KUTTL_VERSION=0.12.1 ARG OPERATOR_SDK_VERSION=1.22.2 -RUN yum -y install httpd-tools podman docker; exit 0 - # Install kubectl tool which is used in e2e-tests RUN curl -sSL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \ chmod +x /usr/local/bin/kubectl