Skip to content

Commit

Permalink
ci/installdeps.sh: Clean up to enable repos consistently
Browse files Browse the repository at this point in the history
We should have a clear two-step flow where we enable repos (updates-testing
and the CoreOS/continuous COPR) and then install packages.

This way we also get skopeo from updates-testing which a future
PR will need.
  • Loading branch information
cgwalters committed Feb 28, 2022
1 parent d959baa commit 36209f7
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions ci/installdeps.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
#!/bin/bash
set -xeuo pipefail

# Always pull ostree from updates-testing to avoid the bodhi wait
dnf -y --enablerepo=updates-testing update ostree-devel

# Our tests depend on this
dnf -y install skopeo

# For some reason dnf copr enable -y says there are no builds?
cat >/etc/yum.repos.d/coreos-continuous.repo << 'EOF'
[copr:copr.fedorainfracloud.org:group_CoreOS:continuous]
Expand All @@ -21,5 +15,11 @@ enabled=1
enabled_metadata=1
EOF

# For now pull ostree from git
dnf update -y ostree
# Pull skopeo and ostree from updates-testing, since we depend on new features in our git main
dnf config-manager --set-enabled updates-testing

# Our tests depend on this
dnf -y install skopeo

# Always pull ostree from updates-testing to avoid the bodhi wait
dnf -y update ostree

0 comments on commit 36209f7

Please sign in to comment.