From 23808bbc3e5db29d8cbf606b7c7bcec3445ba043 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: May 04 2018 16:06:00 +0000
Subject: tree: Bump to F28


This is my naive attempt at bumping FAHC to F28. I dropped some
workarounds that shouldn't be needed anymore, like pulling in a new
enough rpm-ostree, or a modified fedora-atomic manifest.

---

diff --git a/README.md b/README.md
index 68bdd0e..0778ab1 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/27/x86_64/buildmaster
+$ rpm-ostree rebase fahc:fahc/28/x86_64/buildmaster
 ```
 
 Job status
diff --git a/centos-ci/containers/fah-buildtools/Dockerfile b/centos-ci/containers/fah-buildtools/Dockerfile
index fa5ceb0..ad0980f 100644
--- a/centos-ci/containers/fah-buildtools/Dockerfile
+++ b/centos-ci/containers/fah-buildtools/Dockerfile
@@ -1,10 +1,5 @@
-FROM registry.fedoraproject.org/fedora:27
-# Pull rpm-ostree from a COPR dev for unified core fixes
-ADD walters-buildtools.repo /etc/yum.repos.d
-RUN cd /etc/yum.repos.d && curl -L -O https://copr.fedorainfracloud.org/coprs/walters/rpm-ostree-dev/repo/fedora-27/walters-rpm-ostree-dev-fedora-27.repo
-# These bits aren't in updates-testing yet
-RUN yum -y update && \
-    yum -y --enablerepo=updates-testing install \
+FROM registry.fedoraproject.org/fedora:28
+RUN yum -y install \
         ostree rpm-ostree rpm-build selinux-policy-targeted createrepo_c /usr/bin/repomanage \
         lorax mock fedpkg rpmdistro-gitoverlay && \
     yum clean all
diff --git a/centos-ci/run-treecompose b/centos-ci/run-treecompose
index 803fcb8..a6ce358 100755
--- a/centos-ci/run-treecompose
+++ b/centos-ci/run-treecompose
@@ -4,7 +4,7 @@ basedir=$(cd $(dirname $0) && pwd)
 . ${basedir}/libtask.sh
 . ${basedir}/libtoolbox.sh
 
-vmajor=27
+vmajor=28
 ref=fahc/${vmajor}/x86_64/buildmaster
 
 ~/fedora-atomic-host-continuous/centos-ci/containers/fah-buildtools/ensure-built.sh
@@ -23,13 +23,6 @@ done
 test -d ostree/repo || ostree --repo=ostree/repo init --mode=archive
 
 treefile=~/fedora-atomic/fedora-atomic-host.json
-(cd ~/fedora-atomic
- git config user.email "noreply@ci.centos.org"
- git config user.name "CentOS CI"
- git remote add walters https://pagure.io/forks/walters/fedora-atomic.git || true
- git fetch walters
- git cherry-pick walters/f27 < /dev/null
-)
 
 pyeditjson() {
     cat >editjson.py <<EOF
diff --git a/overlay.yml b/overlay.yml
index 0c69dff..3579159 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 27, and we
+# Broadly speaking, dependencies are pulled from Fedora 28, and we
 # track git master for things we are actively developing.
 
 aliases:
@@ -23,7 +23,7 @@ distgit:
   branch: master
 
 root:
-  mock: fedora-27-$arch
+  mock: fedora-28-$arch
 
 cache:
   buildserial: 0