From e315c0d16a670b4c4a8b59eec28ebd66175011fa Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Feb 20 2019 14:59:51 +0000 Subject: tree: Bump to f29 We still have a bunch of our CI that relies on FAHC. So for now, let's just keep bumping it so e.g. rpm-ostree/ostree is actually tested against the version we're delivering to. --- diff --git a/README.md b/README.md index 0778ab1..683d0e7 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ From a currently running Fedora Atomic Host: ``` $ ostree remote add fahc --set=gpg-verify=false https://ci.centos.org/artifacts/sig-atomic/fahc/ostree/repo/ -$ rpm-ostree rebase fahc:fahc/28/x86_64/buildmaster +$ rpm-ostree rebase fahc:fahc/29/x86_64/buildmaster ``` Job status diff --git a/centos-ci/containers/fah-buildtools/Dockerfile b/centos-ci/containers/fah-buildtools/Dockerfile index 0cb8714..a0a8925 100644 --- a/centos-ci/containers/fah-buildtools/Dockerfile +++ b/centos-ci/containers/fah-buildtools/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:28 +FROM registry.fedoraproject.org/fedora:29 ADD walters-buildtools.repo /etc/yum.repos.d RUN yum -y install \ ostree rpm-ostree rpm-build selinux-policy-targeted createrepo_c /usr/bin/repomanage \ diff --git a/centos-ci/run-treecompose b/centos-ci/run-treecompose index 991ab71..f375de6 100755 --- a/centos-ci/run-treecompose +++ b/centos-ci/run-treecompose @@ -4,13 +4,13 @@ basedir=$(cd $(dirname $0) && pwd) . ${basedir}/libtask.sh . ${basedir}/libtoolbox.sh -vmajor=28 +vmajor=29 ref=fahc/${vmajor}/x86_64/buildmaster assembler=quay.io/cgwalters/coreos-assembler:alpha # This is managed by JJB but that's a pain to maintain -(cd ~/fedora-atomic && git checkout f28 - # convert to yaml and add rojig manually until this PR makes it to the f28 +(cd ~/fedora-atomic && git checkout f29 + # convert to yaml and add rojig manually until this PR makes it to the f29 # branch: https://pagure.io/fedora-atomic/pull-request/125 python -c ' import sys, json, yaml diff --git a/overlay.yml b/overlay.yml index 03dc975..943cfe6 100644 --- a/overlay.yml +++ b/overlay.yml @@ -2,7 +2,7 @@ # used for downstream content (Docker images, rpm-ostree commits), # but can also be used directly by yum. -# Broadly speaking, dependencies are pulled from Fedora 28, and we +# Broadly speaking, dependencies are pulled from Fedora 29, and we # track git master for things we are actively developing. aliases: @@ -23,7 +23,7 @@ distgit: branch: master root: - mock: fedora-28-$arch + mock: fedora-29-$arch cache: buildserial: 0