From aaa7242805bb56ea40141c6616c6e0166b130053 Mon Sep 17 00:00:00 2001 From: divyansh42 Date: Tue, 30 Jul 2024 23:37:47 +0530 Subject: [PATCH] Update CI dockerfile to fix CentOS changes Signed-off-by: divyansh42 --- ci/ci.Dockerfile | 5 +++++ hack/install-osp.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/ci.Dockerfile b/ci/ci.Dockerfile index 6eab75c..545df69 100644 --- a/ci/ci.Dockerfile +++ b/ci/ci.Dockerfile @@ -4,6 +4,11 @@ FROM registry.ci.openshift.org/openshift/release:golang-1.20 # Add kubernetes repository ADD ci/kubernetes.repo /etc/yum.repos.d/ +# Change baseurl for CentOS EOL workaround +# https://blog.centos.org/2023/04/end-dates-are-coming-for-centos-stream-8-and-centos-linux-7/ +RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* +RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* + RUN yum install -y kubectl httpd-tools jq make git which RUN rpm -Uvh https://github.com/tektoncd/cli/releases/download/v0.33.0/tektoncd-cli-0.33.0_Linux-64bit.rpm diff --git a/hack/install-osp.sh b/hack/install-osp.sh index 2e6fb25..36abb12 100755 --- a/hack/install-osp.sh +++ b/hack/install-osp.sh @@ -114,7 +114,7 @@ esac # wait until tekton pipelines operator is created echo "Waiting for OpenShift Pipelines Operator to be created..." -timeout 2m bash <<- EOF +timeout 3m bash <<- EOF until oc get deployment openshift-pipelines-operator -n openshift-operators; do sleep 5 done