From 0c2ddd833f8e6892328cdb7a9da190ffac962f7b Mon Sep 17 00:00:00 2001
From: Tomas Hrcka <thrcka@redhat.com>
Date: Feb 19 2019 18:36:49 +0000
Subject: Rawhide is f31


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

---

diff --git a/fedora.conf b/fedora.conf
index 1be2ea1..4a0df19 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -36,7 +36,7 @@ hashed_directories = True
 # RUNROOT settings
 runroot = True
 runroot_channel = 'compose'
-runroot_tag = 'f30-build'
+runroot_tag = 'f31-build'
 
 ## PDC settings
 pdc_url = 'https://pdc.fedoraproject.org/rest_api/v1'
@@ -52,7 +52,7 @@ pkgset_source = 'koji' # koji, repos
 # pkgset_repos = {}
 
 # PKGSET - KOJI
-pkgset_koji_tag = 'f30'
+pkgset_koji_tag = 'f31'
 pkgset_koji_inherit = False
 
 filter_system_release_packages = False
@@ -301,11 +301,11 @@ 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_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f30'
 global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
 global_version = '30'
 # live_images ignores this in favor of live_target
-global_target = 'f30'
+global_target = 'f31'
 
 image_build = {
     '^Container$': [
@@ -325,7 +325,7 @@ image_build = {
             'factory-parameters': {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f30container", "FGC=f30" ]',
+                'docker_env': '[ "DISTTAG=f31container", "FGC=f31" ]',
                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "30"}',
             },
         },
@@ -345,7 +345,7 @@ image_build = {
             'factory-parameters': {
                 'dockerversion': "1.10.1",
                 'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f30container", "FGC=f30" ]',
+                'docker_env': '[ "DISTTAG=f31container", "FGC=f31" ]',
                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "30"}',
             },
         }
@@ -634,7 +634,7 @@ failable_deliverables = [
     })
 ]
 
-live_target = 'f30'
+live_target = 'f31'
 live_images_no_rename = True
 # fomat: [(variant_uid_regex, {arch|*: scm_dict})]
 live_images = [
diff --git a/nightly.sh b/nightly.sh
index 3e66f14..3f345ec 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -4,7 +4,7 @@
 export LC_ALL=C
 
 CONFIG="fedora.conf"
-TARGET_DIR="/mnt/koji/compose/rawhide"
+TARGET_DIR="/mnt/koji/compose/branched"
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY="--nightly"
 SKIP_PHASES="--skip-phase=productimg"