toolbox: should be blocking (f39)

I marked toolbox as failable when we were getting everthing working on
it (and so we would still have composes). Now that it's working, lets
mark it blocking again.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

fedora.conf

@@ -6,15 +6,15 @@ from multilib import *
 # PRODUCT INFO
 release_name = 'Fedora'
 release_short = 'Fedora'
-release_version = 'Rawhide'
+release_version = '39'
 
 # GENERAL SETTINGS
 comps_file = {
     'scm': 'git',
     'repo': 'https://pagure.io/fedora-comps.git',
     'branch': 'main',
-    'file': 'comps-rawhide.xml',
-    'command': 'make comps-rawhide.xml'
+    'file': 'comps-f39.xml',
+    'command': 'make comps-f39.xml'
 }
 
 variants_file='variants-fedora.xml'
@@ -61,7 +61,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/39']
 createrepo_num_workers = 10
 
 # CHECKSUMS
@@ -197,9 +197,9 @@ image_volid_formats = [
 
 
 # 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/f39'
 global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
-global_version = 'Rawhide'
+global_version = '39'
 # live_images ignores this in favor of live_target
 global_target = 'f39'
 
@@ -256,7 +256,7 @@ image_build = {
                     'repo': 'Everything',
                     'install_tree_from': 'Everything',
                     'subvariant': 'Container_Toolbox',
-                    'failable': ['*'],
+                    'failable': [''],
                     },
             'factory-parameters': {
                 'dockerversion': "1.10.1",
@@ -724,11 +724,11 @@ ostree = {
         "unified_core": True,
         "treefile": "fedora-silverblue.yaml",
         "config_url": "https://pagure.io/workstation-ostree-config.git",
-        "config_branch": "main",
+        "config_branch": "f39",
         "repo": "Everything",
         "tag_ref": False,
         "ostree_repo": "/mnt/koji/compose/ostree/repo/",
-        "ostree_ref": "fedora/rawhide/${basearch}/silverblue",
+        "ostree_ref": "fedora/39/${basearch}/silverblue",
         "runroot_packages": ["selinux-policy-targeted"],
         "arches": ["x86_64", "ppc64le", "aarch64"],
         "failable": ['*'],
@@ -739,11 +739,11 @@ ostree = {
         "unified_core": True,
         "treefile": "fedora-kinoite.yaml",
         "config_url": "https://pagure.io/workstation-ostree-config.git",
-        "config_branch": "main",
+        "config_branch": "f39",
         "repo": "Everything",
         "tag_ref": False,
         "ostree_repo": "/mnt/koji/compose/ostree/repo/",
-        "ostree_ref": "fedora/rawhide/${basearch}/kinoite",
+        "ostree_ref": "fedora/39/${basearch}/kinoite",
         "runroot_packages": ["selinux-policy-targeted"],
         "arches": ["x86_64", "ppc64le", "aarch64"],
         "failable": ['*'],
@@ -754,11 +754,11 @@ ostree = {
         "unified_core": True,
         "treefile": "fedora-sericea.yaml",
         "config_url": "https://pagure.io/workstation-ostree-config.git",
-        "config_branch": "main",
+        "config_branch": "f39",
         "repo": "Everything",
         "tag_ref": False,
         "ostree_repo": "/mnt/koji/compose/ostree/repo/",
-        "ostree_ref": "fedora/rawhide/${basearch}/sericea",
+        "ostree_ref": "fedora/39/${basearch}/sericea",
         "runroot_packages": ["selinux-policy-targeted"],
         "arches": ["x86_64", "ppc64le", "aarch64"],
         "failable": ['*'],
@@ -769,11 +769,11 @@ ostree = {
         "unified_core": True,
         "treefile": "fedora-onyx.yaml",
         "config_url": "https://pagure.io/workstation-ostree-config.git",
-        "config_branch": "main",
+        "config_branch": "f39",
         "repo": "Everything",
         "tag_ref": False,
         "ostree_repo": "/mnt/koji/compose/ostree/repo/",
-        "ostree_ref": "fedora/rawhide/${basearch}/onyx",
+        "ostree_ref": "fedora/39/${basearch}/onyx",
         "runroot_packages": ["selinux-policy-targeted"],
         "arches": ["x86_64"],
         "failable": ['*'],
@@ -795,8 +795,8 @@ ostree_installer = [
                 "ostree_osname=fedora",
                 "ostree_oskey=fedora-39-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/39/x86_64/silverblue",
+                "ostree_update_ref=fedora/39/x86_64/silverblue",
                 "flatpak_remote_name=fedora",
                 # using registry-no-cdn avoids redirects to the CDN;
                 # needed because of network restrictions on koji runroot
@@ -822,8 +822,8 @@ ostree_installer = [
                 "ostree_osname=fedora",
                 "ostree_oskey=fedora-39-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/39/ppc64le/silverblue",
+                "ostree_update_ref=fedora/39/ppc64le/silverblue",
                 "flatpak_remote_name=fedora",
                 # using registry-no-cdn avoids redirects to the CDN;
                 # needed because of network restrictions on koji runroot
@@ -849,8 +849,8 @@ ostree_installer = [
                 "ostree_osname=fedora",
                 "ostree_oskey=fedora-39-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/39/aarch64/silverblue",
+                "ostree_update_ref=fedora/39/aarch64/silverblue",
                 "flatpak_remote_name=fedora",
                 # using registry-no-cdn avoids redirects to the CDN;
                 # needed because of network restrictions on koji runroot
@@ -878,8 +878,8 @@ ostree_installer = [
                 "ostree_osname=fedora",
                 "ostree_oskey=fedora-39-primary",
                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/x86_64/kinoite",
-                "ostree_update_ref=fedora/rawhide/x86_64/kinoite",
+                "ostree_install_ref=fedora/39/x86_64/kinoite",
+                "ostree_update_ref=fedora/39/x86_64/kinoite",
                 "flatpak_remote_name=fedora",
                 # using registry-no-cdn avoids redirects to the CDN;
                 # needed because of network restrictions on koji runroot
@@ -904,8 +904,8 @@ ostree_installer = [
                 "ostree_osname=fedora",
                 "ostree_oskey=fedora-39-primary",
                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/ppc64le/kinoite",
-                "ostree_update_ref=fedora/rawhide/ppc64le/kinoite",
+                "ostree_install_ref=fedora/39/ppc64le/kinoite",
+                "ostree_update_ref=fedora/39/ppc64le/kinoite",
                 "flatpak_remote_name=fedora",
                 # using registry-no-cdn avoids redirects to the CDN;
                 # needed because of network restrictions on koji runroot
@@ -930,8 +930,8 @@ ostree_installer = [
                 "ostree_osname=fedora",
                 "ostree_oskey=fedora-39-primary",
                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/aarch64/kinoite",
-                "ostree_update_ref=fedora/rawhide/aarch64/kinoite",
+                "ostree_install_ref=fedora/39/aarch64/kinoite",
+                "ostree_update_ref=fedora/39/aarch64/kinoite",
                 "flatpak_remote_name=fedora",
                 # using registry-no-cdn avoids redirects to the CDN;
                 # needed because of network restrictions on koji runroot
@@ -958,8 +958,8 @@ ostree_installer = [
                 "ostree_osname=fedora",
                 "ostree_oskey=fedora-39-primary",
                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/x86_64/sericea",
-                "ostree_update_ref=fedora/rawhide/x86_64/sericea",
+                "ostree_install_ref=fedora/39/x86_64/sericea",
+                "ostree_update_ref=fedora/39/x86_64/sericea",
                 "flatpak_remote_name=fedora",
                 # using registry-no-cdn avoids redirects to the CDN;
                 # needed because of network restrictions on koji runroot
@@ -986,8 +986,8 @@ ostree_installer = [
                 "ostree_osname=fedora",
                 "ostree_oskey=fedora-39-primary",
                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/x86_64/onyx",
-                "ostree_update_ref=fedora/rawhide/x86_64/onyx",
+                "ostree_install_ref=fedora/39/x86_64/onyx",
+                "ostree_update_ref=fedora/39/x86_64/onyx",
                 "flatpak_remote_name=fedora",
                 # using registry-no-cdn avoids redirects to the CDN;
                 # needed because of network restrictions on koji runroot

general.conf

@@ -9,7 +9,7 @@ hashed_directories = True
 
 # RUNROOT settings
 runroot_channel = 'compose'
-runroot_tag = 'f40-build'
+runroot_tag = 'f39-build'
 
 # PKGSET
 pkgset_source = 'koji' # koji, repos

nightly.sh

@@ -4,19 +4,19 @@
 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=""
 DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
 SHORT="Fedora"
-RELEASE="rawhide"
-RELEASE_TITLE="Rawhide"
-COMPSFILE="comps-rawhide.xml"
+RELEASE="39"
+RELEASE_TITLE="39"
+COMPSFILE="comps-f39.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="devel@lists.fedoraproject.org test-reports@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"
@@ -203,7 +203,7 @@ old_umask=$(umask)
 umask 0002
 for variant in 'silverblue' 'kinoite' 'sericea' 'onyx'; do
     for arch in x86_64 ppc64le aarch64; do
-        ref="fedora/rawhide/${arch}/${variant}"
+        ref="fedora/39/${arch}/${variant}"
         if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi
 
         ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "${ref}"
@@ -213,8 +213,8 @@ done
 # Set to old umask
 umask $old_umask
 
-# Push rawhide base container image to fedora registry
-# Push rawhide ostree base container image to fedora registry
+# Push 39 base container image to fedora registry
+# Push 39 ostree base container image to fedora registry
 pushd ./releng
 pushd ./scripts
 ./sync-latest-container-base-image.sh 39