From 08c6b918226306fc52bf51590232547b16449d38 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Mon, 16 Dec 2019 12:28:48 +0100 Subject: [PATCH 1/3] OKD 4.4: install CRI-O from F31 modules Enable CRI-O 1.16 module in cosa container and fetch RPMs via yumdownloader from DNF repos instead of RHEL8 --- .../release/openshift-release-release-4.4-periodics.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml index f38ef02f5bc74..06dc1127decd6 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml @@ -512,10 +512,14 @@ periodics: RUN set -xeuo pipefail && \\ mkdir -p /srv/repo /tmp/working && \\ curl -L "${tar_url}" | tar xf - -C /srv/repo/ && \\ + cp /etc/yum.repos.d/fedora-updates-testing-modular.repo /tmp && \\ rm -rf /etc/yum.repos.d/* && \\ + cp /tmp/fedora-updates-testing-modular.repo /etc/yum.repos.d/ && \\ + sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/fedora-updates-testing-modular.repo && \\ rpm-ostree db list --repo /srv/repo "${ostree_ref}" > /tmp/packages && \\ + dnf module enable -y cri-o:1.16 && \\ + if ! grep -q cri-o /tmp/packages; then yumdownloader -y --disablerepo=* --enablerepo=updates-testing-modular --destdir=/tmp/rpms cri-o cri-tools; fi && \\ curl http://base-${BRANCH//\./-}-rhel8.ocp.svc > /etc/yum.repos.d/rhel8.repo && \\ - if ! grep -q cri-o /tmp/packages; then yumdownloader -y --disablerepo=* --enablerepo=rhel-8* --destdir=/tmp/rpms cri-o cri-tools; fi && \\ if ! grep -q glusterfs-fuse /tmp/packages; then yumdownloader -y --disablerepo=* --enablerepo=rhel-8* --destdir=/tmp/rpms attr glusterfs glusterfs-client-xlators glusterfs-fuse glusterfs-libs psmisc; fi && \\ cd /tmp/working && \\ for i in \$(find /tmp/rpms/ -name *.rpm); do echo "Extracting \$i ..."; rpm2cpio \$i | cpio -div; done && \\ From 2e93565bd9d61fa12f6f6b0372dc5989a4574c9a Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Thu, 19 Dec 2019 18:35:23 +0100 Subject: [PATCH 2/3] OKD 4.4: bump oc to 4.4 nightly --- .../release/openshift-release-release-4.4-periodics.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml index 06dc1127decd6..66f9fe3cde986 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml @@ -407,7 +407,7 @@ periodics: mkdir $HOME/.docker/ cp /usr/local/pull-secret/.dockerconfigjson $HOME/.docker/config.json mkdir $HOME/bin - curl https://mirror.openshift.com/pub/openshift-v4/clients/ocp-dev-preview/4.3.0-0.nightly-2019-11-13-233341/openshift-client-linux-4.3.0-0.nightly-2019-11-13-233341.tar.gz 2>/dev/null | tar xzf - -C /tmp/bin/ oc + curl https://mirror.openshift.com/pub/openshift-v4/clients/ocp-dev-preview/4.4.0-0.nightly-2019-12-19-100131/openshift-client-linux-4.4.0-0.nightly-2019-12-19-100131.tar.gz 2>/dev/null | tar xzf - -C /tmp/bin/ oc curl -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 2>/dev/null >/tmp/bin/jq chmod ug+x $HOME/bin/oc $HOME/bin/jq From d0f60e5c08d9dc2e303d38940d84a50ad8c842ed Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Mon, 16 Dec 2019 23:06:15 +0100 Subject: [PATCH 3/3] OKD 4.4 machine-os-content: remove attr No longer required, https://github.com/coreos/fedora-coreos-config/commit/20671888b07da26bd0706deaa5e7ef6293255ab1 --- .../release/openshift-release-release-4.4-periodics.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml index 66f9fe3cde986..0ee14db12b54b 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml @@ -520,7 +520,7 @@ periodics: dnf module enable -y cri-o:1.16 && \\ if ! grep -q cri-o /tmp/packages; then yumdownloader -y --disablerepo=* --enablerepo=updates-testing-modular --destdir=/tmp/rpms cri-o cri-tools; fi && \\ curl http://base-${BRANCH//\./-}-rhel8.ocp.svc > /etc/yum.repos.d/rhel8.repo && \\ - if ! grep -q glusterfs-fuse /tmp/packages; then yumdownloader -y --disablerepo=* --enablerepo=rhel-8* --destdir=/tmp/rpms attr glusterfs glusterfs-client-xlators glusterfs-fuse glusterfs-libs psmisc; fi && \\ + if ! grep -q glusterfs-fuse /tmp/packages; then yumdownloader -y --disablerepo=* --enablerepo=rhel-8* --destdir=/tmp/rpms glusterfs glusterfs-client-xlators glusterfs-fuse glusterfs-libs psmisc; fi && \\ cd /tmp/working && \\ for i in \$(find /tmp/rpms/ -name *.rpm); do echo "Extracting \$i ..."; rpm2cpio \$i | cpio -div; done && \\ mv etc usr/ && mv sbin/* usr/sbin/ && rm -rf sbin/ && \\