From 7889f0a37e8aa29c70be7af9bd5080a191c70ab5 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Aug 09 2018 19:46:28 +0000
Subject: treecompose: Update to use yaml (so rojig works)


---

diff --git a/centos-ci/run-treecompose b/centos-ci/run-treecompose
index b335cc0..c0089e1 100755
--- a/centos-ci/run-treecompose
+++ b/centos-ci/run-treecompose
@@ -9,7 +9,11 @@ ref=fahc/${vmajor}/x86_64/buildmaster
 assembler=quay.io/cgwalters/coreos-assembler
 
 # This is managed by JJB but that's a pain to maintain
-(cd ~/fedora-atomic && git checkout f28)
+(cd ~/fedora-atomic
+ git remote add walters https://pagure.io/forks/walters/fedora-atomic.git || true
+ git fetch walters
+ git reset --hard walters/yaml-port
+)
 
 for v in jigdo ostree; do
     rsync --delete --stats -a sig-atomic@artifacts.ci.centos.org::sig-atomic/${build}/${v}/ ${v}/ || mkdir -p ${v}/
@@ -24,29 +28,29 @@ done
 
 test -d ostree/repo || ostree --repo=ostree/repo init --mode=archive
 
-treefile=~/fedora-atomic/fedora-atomic-host.json
+treefile=~/fedora-atomic/fedora-atomic-host.yaml
 
-pyeditjson() {
-    cat >editjson.py <<EOF
-import sys,json
-jd=json.load(sys.stdin)
+pyedityaml() {
+    cat >edityaml.py <<EOF
+import sys,yaml
+doc=yaml.load(sys.stdin)
 ${1}
-json.dump(jd,sys.stdout)
+yaml.dump(doc,sys.stdout)
 EOF
-    python ./editjson.py && rm -f ./editjson.py
+    python ./edityaml.py && rm -f ./edityaml.py
 }
 
-pysetjsonmember() {
-    pyeditjson "jd['"$1"'] = $2" < ${treefile} > ${treefile}.new && mv ${treefile}{.new,}
+pysetyamlmember() {
+    pyedityaml "doc['"$1"'] = $2" < ${treefile} > ${treefile}.new && mv ${treefile}{.new,}
 }
 
-pyappendjsonmember() {
-    pyeditjson "jd['"$1"'] += $2" < ${treefile} > ${treefile}.new && mv ${treefile}{.new,}
+pyappendyamlmember() {
+    pyedityaml "doc['"$1"'] += $2" < ${treefile} > ${treefile}.new && mv ${treefile}{.new,}
 }
 
 
-pyappendjsonmember "repos" '["fahc-rdgo"]'
-pysetjsonmember "ref" '"'${ref}'"'
+pyappendyamlmember "repos" '["fahc-rdgo"]'
+pysetyamlmember "ref" '"'${ref}'"'
 # To ensure the build overrides; see also https://github.com/rpm-software-management/libdnf/pull/149
 excludes='exclude=ostree ostree-libs ostree-grub2 rpm-ostree'
 for repo in ~/fedora-atomic/*.repo; do
@@ -73,7 +77,7 @@ run_assembler coreos-assembler --ex-jigdo-output-set /srv/build/jigdo ${compose_
      --add-metadata-string=rpmostree.gitrev0="$(cd ~/fedora-atomic && git describe --tags --always --abbrev=42 --match='v*')" \
      --add-metadata-string=rpmostree.gitrepo1="https://pagure.io/fedora-atomic-host-continuous" \
      --add-metadata-string=rpmostree.gitrev1="$(cd ~/fedora-atomic-host-continuous && git describe --tags --always --abbrev=42 --match='v*')" \
-     /srv/home/fedora-atomic/fedora-atomic-host.json
+     /srv/home/fedora-atomic/$(basename ${treefile})
 sudo chown -R -h $USER:$USER repo-build jigdo
 rev=$(ostree --repo=repo-build rev-parse ${ref})
 # Now compress new objects and copy back - note this will also avoid root-owned objects