Skip to content

Commit

Permalink
ci/installdeps.sh: Pull ostree from rdgo on f30 too
Browse files Browse the repository at this point in the history
This is a bit of a hack, but does the trick now. Eventually, we'll need
to either bump rdgo to f30, or set up continuous builds some other way
(e.g. Packit or Jenkins pipelines).

Closes: #1900
Approved by: cgwalters
  • Loading branch information
jlebon authored and rh-atomic-bot committed Sep 9, 2019
1 parent bc50cac commit e589161
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions ci/installdeps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ set -xeuo pipefail
dn=$(dirname $0)
. ${dn}/libbuild.sh

# Use the latest ostree by default
# Use the latest ostree by default (XXX: currently pulling in f29 ostree, need
# to bump rdgo to f30 or wait for packit)
id=$(. /etc/os-release && echo $ID)
version_id=$(. /etc/os-release && echo $VERSION_ID)
if [ "$id" == fedora ] && [ "$version_id" == 29 ]; then
if [ "$id" == fedora ] && [ "$version_id" -ge 29 ]; then
echo -e '[fahc]\nmetadata_expire=1m\nbaseurl=https://ci.centos.org/artifacts/sig-atomic/fahc/rdgo/build/\ngpgcheck=0\n' > /etc/yum.repos.d/fahc.repo
# Until we fix https://github.com/rpm-software-management/libdnf/pull/149
excludes='exclude=ostree ostree-libs ostree-grub2 rpm-ostree'
Expand Down

0 comments on commit e589161

Please sign in to comment.