Skip to content

OKD 4.4: install CRI-O from F31 modules #6415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 3 commits into from
Jan 6, 2020
Merged

OKD 4.4: install CRI-O from F31 modules #6415

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08c6b91
OKD 4.4: install CRI-O from F31 modules
Dec 16, 2019
2e93565
OKD 4.4: bump oc to 4.4 nightly
Dec 19, 2019
d0f60e5
OKD 4.4 machine-os-content: remove attr
Dec 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ci-operator/jobs/openshift/release/openshift-release-release-4.4-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 && \\
Copy link
Copy Markdown
Contributor Author

@vrutkovs vrutkovs Dec 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: Host repo files similar to base-4-x.svc instead of re-using repo files from cosa container

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 && \\
Copy link
Copy Markdown
Contributor

@smarterclayton smarterclayton Jan 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it needs to be crio 1.17 now

Copy link
Copy Markdown
Contributor Author

@vrutkovs vrutkovs Jan 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There hasn't been cri-o 1.17 release yet - and no 1.17 module yet. I'll be pinging @lsm5 to get module created and update this task

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/ && \\
Expand Down