From 37de1c7942bd5563b3da238159a7e269c0fe6d1a Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Aug 13 2019 08:28:43 +0000
Subject: Branching f31 from rawhide


Signed-off-by: Tomas Hrcka <thrcka@redhat.com>

---

diff --git a/fedora.conf b/fedora.conf
index f498770..e18a7d6 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -1,7 +1,7 @@
 # PRODUCT INFO
 release_name = 'Fedora'
 release_short = 'Fedora'
-release_version = 'Rawhide'
+release_version = '31'
 release_is_layered = False
 
 # GENERAL SETTINGS
@@ -10,13 +10,13 @@ comps_file = {
     'scm': 'git',
     'repo': 'https://pagure.io/fedora-comps.git',
     'branch': 'master',
-    'file': 'comps-rawhide.xml',
-    'command': 'make comps-rawhide.xml'
+    'file': 'comps-f31.xml',
+    'command': 'make comps-f31.xml'
 }
 module_defaults_dir = {
     'scm': 'git',
     'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
-    'branch': 'master',
+    'branch': 'f31',
     'dir': '.'
 }
 
@@ -77,7 +77,7 @@ repoclosure_backend = 'dnf'
 createrepo_deltas = False
 createrepo_database = True
 createrepo_use_xz = True
-createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/rawhide']
+createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/%s' % pkgset_koji_tag]
 
 # CHECKSUMS
 media_checksums = ['sha256']
@@ -293,7 +293,7 @@ translate_paths = [
 # These will be inherited by live_media, live_images and image_build
 global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
 global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
-global_version = 'Rawhide'
+global_version = '31'
 # live_images ignores this in favor of live_target
 global_target = 'f31'
 
@@ -719,11 +719,11 @@ ostree = {
         "force_new_commit": True,
         "treefile": "fedora-silverblue.yaml",
         "config_url": "https://pagure.io/workstation-ostree-config.git",
-        "config_branch": "master",
+        "config_branch": "f31",
         "repo": "Everything",
         "tag_ref": False,
         "ostree_repo": "/mnt/koji/compose/ostree/repo/",
-        "ostree_ref": "fedora/rawhide/${basearch}/silverblue",
+        "ostree_ref": "fedora/31/${basearch}/silverblue",
         "arches": ["x86_64", "ppc64le", "aarch64"],
         "failable": ['*'],
     }
@@ -743,11 +743,11 @@ ostree_installer = [
                 "ostree_osname=fedora",
                 "ostree_oskey=fedora-31-primary",
                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/x86_64/silverblue",
-                "ostree_update_ref=fedora/rawhide/x86_64/silverblue",
+                "ostree_install_ref=fedora/31/x86_64/silverblue",
+                "ostree_update_ref=fedora/31/x86_64/silverblue",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f31',
             'failable': ['*'],
         },
         "ppc64le": {
@@ -762,11 +762,11 @@ ostree_installer = [
                 "ostree_osname=fedora",
                 "ostree_oskey=fedora-31-primary",
                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/ppc64le/silverblue",
-                "ostree_update_ref=fedora/rawhide/ppc64le/silverblue",
+                "ostree_install_ref=fedora/31/ppc64le/silverblue",
+                "ostree_update_ref=fedora/31/ppc64le/silverblue",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f31',
             'failable': ['*'],
         },
         "aarch64": {
@@ -781,11 +781,11 @@ ostree_installer = [
                 "ostree_osname=fedora",
                 "ostree_oskey=fedora-31-primary",
                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/aarch64/silverblue",
-                "ostree_update_ref=fedora/rawhide/aarch64/silverblue",
+                "ostree_install_ref=fedora/31/aarch64/silverblue",
+                "ostree_update_ref=fedora/31/aarch64/silverblue",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'master',
+            'template_branch': 'f31',
             'failable': ['*'],
         }
     })
diff --git a/nightly.sh b/nightly.sh
index e5bf123..d86b09b 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -11,12 +11,12 @@ SKIP_PHASES="--skip-phase=productimg"
 DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
 SHORT="Fedora"
-RELEASE="rawhide"
-RELEASE_TITLE="Rawhide"
-COMPSFILE="comps-rawhide.xml"
+RELEASE="31"
+RELEASE_TITLE="31"
+COMPSFILE="comps-f31.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
-FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
+FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
 RSYNCPREFIX="sudo -u ftpsync"
 RSYNCTARGET="/pub/fedora/linux/development/$RELEASE"
 RSYNCALTTARGET="/pub/alt/development/$RELEASE"
@@ -111,7 +111,7 @@ fi
 ./releng/scripts/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/"  --only-arches ppc64le s390x x86_64> "$DESTDIR/logs/depcheck"
 
 [ -z "$ARCH" ] && {
-./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log
+./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt branched &> $DESTDIR/logs/critpath.log
 }
 
 # Tell interested persons that the rsync is starting (zomg!)
@@ -188,7 +188,7 @@ $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWC
 
 # sync Silverblue to the unified ostree repo
 for arch in x86_64 ppc64le aarch64; do
-    ref="fedora/rawhide/${arch}/silverblue"
+    ref="fedora/31/${arch}/silverblue"
     if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi
 
     ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "${ref}"