From cf4bbe812458b36441dbd092f14b6d93de90cb6d Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Mar 06 2018 13:37:02 +0000
Subject: fedora.conf: atomic: move to unified ostree repo structure


We move to /compose/atomic/repo for the compose time repo and to
/atomic/repo for the production/user repo. See [1].

[1] https://lists.fedoraproject.org/archives/list/rel-eng@lists.fedoraproject.org/thread/KLN5L33BIR3ZEHC5RIG4NXGO7LT6HBXJ/

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>

---

diff --git a/fedora.conf b/fedora.conf
index c2a2432..caa4409 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -736,7 +736,7 @@ ostree = [
             "config_url": "https://pagure.io/fedora-atomic.git",
             "config_branch": "master",
             "repo": "Everything",
-            "ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
+            "ostree_repo": "/mnt/koji/compose/atomic/repo/",
             'failable': ['*'],
         },
         "x86_64": {
@@ -745,7 +745,7 @@ ostree = [
             "config_url": "https://pagure.io/fedora-atomic.git",
             "config_branch": "master",
             "repo": "Everything",
-            "ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
+            "ostree_repo": "/mnt/koji/compose/atomic/repo/",
             'failable': ['*'],
         },
         "ppc64le": {
@@ -754,7 +754,7 @@ ostree = [
             "config_url": "https://pagure.io/fedora-atomic.git",
             "config_branch": "master",
             "repo": "Everything",
-            "ostree_repo": "/mnt/koji/compose/atomic/rawhide/",
+            "ostree_repo": "/mnt/koji/compose/atomic/repo/",
             'failable': ['*'],
         }
     }),
@@ -780,8 +780,8 @@ ostree_installer = [
             "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
                              "ostree-based-installer/lorax-embed-repo.tmpl"],
             "add_template_var": [
-                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
-                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
+                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
                 "ostree_osname=fedora-atomic",
                 "ostree_install_ref=fedora/rawhide/x86_64/atomic-host",
                 "ostree_update_ref=fedora/rawhide/x86_64/atomic-host",
@@ -797,8 +797,8 @@ ostree_installer = [
             "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
                              "ostree-based-installer/lorax-embed-repo.tmpl"],
             "add_template_var": [
-                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
-                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
+                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
                 "ostree_osname=fedora-atomic",
                 "ostree_install_ref=fedora/rawhide/aarch64/atomic-host",
                 "ostree_update_ref=fedora/rawhide/aarch64/atomic-host",
@@ -814,8 +814,8 @@ ostree_installer = [
             "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
                              "ostree-based-installer/lorax-embed-repo.tmpl"],
             "add_template_var": [
-                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
-                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/rawhide/",
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
+                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
                 "ostree_osname=fedora-atomic",
                 "ostree_install_ref=fedora/rawhide/ppc64le/atomic-host",
                 "ostree_update_ref=fedora/rawhide/ppc64le/atomic-host",
@@ -833,8 +833,8 @@ ostree_installer = [
             "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
                              "ostree-based-installer/lorax-embed-repo.tmpl"],
             "add_template_var": [
-                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/rawhide/",
-                "ostree_update_repo=https://kojipkgs.fedoraproject.org/compose/ostree/rawhide/",
+                "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/atomic/repo/",
+                "ostree_update_repo=https://kojipkgs.fedoraproject.org/atomic/repo/",
                 "ostree_osname=fedora-workstation",
                 "ostree_install_ref=fedora/rawhide/x86_64/workstation",
                 "ostree_update_ref=fedora/rawhide/x86_64/workstation",
diff --git a/nightly.sh b/nightly.sh
index dde2744..356e30f 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -21,9 +21,8 @@ RSYNCPREFIX="sudo -u ftpsync"
 RSYNCTARGET="/pub/fedora/linux/development/$RELEASE"
 RSYNCALTTARGET="/pub/alt/development/$RELEASE"
 RSYNCSECTARGET="/pub/fedora-secondary/development/$RELEASE"
-ATOMICHOSTREPO="/mnt/koji/compose/atomic/$RELEASE/"
-ATOMICWSREPO="/mnt/koji/compose/ostree/$RELEASE/"
-ATOMICHOSTDEST="/mnt/koji/atomic/$RELEASE/"
+ATOMICSRCREPO="/mnt/koji/compose/atomic/repo/"
+ATOMICDESTREPO="/mnt/koji/atomic/repo/"
 OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
 # uncomment and edit for resuming a failed compose
 #COMPOSE_ID="Fedora-23-20150530.n.0"
@@ -175,7 +174,14 @@ $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
 $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
 $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"
 
-$RSYNCPREFIX rsync -avhH --delete-after $ATOMICHOSTREPO $ATOMICHOSTDEST
+
+# sync over atomic host/workstation to the unified ostree repo
+for arch in x86_64 aarch64 ppc64le; do
+    ostree pull-local --repo=$ATOMICDESTREPO $ATOMICSRCREPO --depth=-1 "fedora/rawhide/${arch}/atomic-host"
+done
+for arch in x86_64; do
+    ostree pull-local --repo=$ATOMICDESTREPO $ATOMICSRCREPO --depth=-1 "fedora/rawhide/${arch}/workstation"
+done
 
 # Tell interested persons that the rsync is done.
 send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete