From 138c1cc5404a08fe74c1086dd3ca265c74ff603a Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Aug 10 2018 18:57:34 +0000
Subject: run-treecompose: Go back to f28


Commit 7889f0a inadvertently was using the master branch instead of f28,
so we were composing an f29 tree with an f28 overlay. This goes back to
f28 for now by just converting the JSON to YAML and manually adding the
rojig section.

---

diff --git a/centos-ci/run-treecompose b/centos-ci/run-treecompose
index c0089e1..a777a42 100755
--- a/centos-ci/run-treecompose
+++ b/centos-ci/run-treecompose
@@ -9,10 +9,20 @@ 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 remote add walters https://pagure.io/forks/walters/fedora-atomic.git || true
- git fetch walters
- git reset --hard walters/yaml-port
+(cd ~/fedora-atomic && git checkout f28
+ # convert to yaml and add rojig manually until this PR makes it to the f28
+ # branch: https://pagure.io/fedora-atomic/pull-request/125
+ python -c '
+import sys, json, yaml
+j=json.load(sys.stdin)
+j["rojig"] = {
+  "name": "fedora-atomic-host",
+  "summary": "Fedora Atomic Host base image",
+  "license": "MIT"
+}
+del j["ex-jigdo-spec"]
+yaml.safe_dump(j, sys.stdout)
+' < fedora-atomic-host.json > fedora-atomic-host.yaml
 )
 
 for v in jigdo ostree; do