#23 run-treecompose: Go back to f28
Merged 5 years ago by walters. Opened 5 years ago by jlebon.
jlebon/fedora-atomic-host-continuous pr/fix-f28  into  master

file modified
+14 -4
@@ -9,10 +9,20 @@ 

  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

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.

rebased onto 138c1cc

5 years ago

Actually, there's still an ex-jigdo-spec key in the included fedora-atomic-host-base.json, but I think that should be fine since rpm-ostree no longer looks for that key (only ex-rojig-spec), so it'll fall back to the inserted rojig key.

Pull-Request has been merged by walters

5 years ago
Metadata