PR#19: tree: Bump to F28 - fedora-atomic-host-continuous

fedora-atomic-host-continuous

#19 tree: Bump to F28

Merged 5 years ago by walters. Opened 5 years ago by jlebon.

jlebon/fedora-atomic-host-continuous pr/bump-f28 into master

tree: Bump to F28

Jonathan Lebon • 5 years ago

23808bb

README.md

file modified

+1 -1

		`@@ -16,7 +16,7 @@`

		```
		`$ 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`

centos-ci/containers/fah-buildtools/Dockerfile

file modified

+2 -7

		`@@ -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`

centos-ci/run-treecompose

file modified

+1 -8

		`@@ -4,7 +4,7 @@`
		`. ${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 @@`
		`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`

overlay.yml

file modified

+2 -2

		`@@ -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 @@`
		`branch: master`

		`root:`
		`- mock: fedora-27-$arch`
		`+ mock: fedora-28-$arch`

		`cache:`
		`buildserial: 0`

jlebon commented 5 years ago

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.