From 0352a126c3b03b3b26c73e0111907b2bf498e0f1 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Tue, 7 Jan 2020 17:18:47 +0100 Subject: [PATCH] OKD 4.4: use repos from fedora image and install open-vm-tools for vSphere --- .../release/openshift-release-release-4.4-periodics.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 0ee14db12b54b..d0c908e2affe8 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,15 +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/ && \\ + rm -rf /etc/yum.repos.d && \\ + ostree --repo=/srv/repo checkout "${ostree_ref}" --subpath /usr/etc/yum.repos.d --user-mode /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 glusterfs-fuse /tmp/packages; then yumdownloader -y --disablerepo=* --enablerepo=rhel-8* --destdir=/tmp/rpms glusterfs glusterfs-client-xlators glusterfs-fuse glusterfs-libs psmisc; fi && \\ + if ! grep -q glusterfs-fuse /tmp/packages; then yumdownloader -y --disablerepo=* --enablerepo=fedora --enablerepo=updates --destdir=/tmp/rpms glusterfs glusterfs-client-xlators glusterfs-fuse glusterfs-libs psmisc; fi && \\ + if ! grep -q open-vm-tools /tmp/packages; then yumdownloader -y --disablerepo=* --enablerepo=fedora --enablerepo=updates --destdir=/tmp/rpms open-vm-tools; 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/ && \\