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..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 @@ -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 @@ -512,11 +512,15 @@ 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 && \\ + 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/ && \\