From fca2c29c351e1f580ace291f74c356d7760de9ba Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 8 Aug 2023 16:27:02 -0700 Subject: [PATCH] adjust for f39 branched Signed-off-by: Kevin Fenzi --- fedora.conf | 46 +++++++++++++++++++++++----------------------- nightly.sh | 12 ++++++------ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/fedora.conf b/fedora.conf index 24281be..ec1c0ae 100644 --- a/fedora.conf +++ b/fedora.conf @@ -13,8 +13,8 @@ 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 @@ -728,7 +728,7 @@ ostree = { "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": ['*'], @@ -743,7 +743,7 @@ ostree = { "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": ['*'], @@ -758,7 +758,7 @@ ostree = { "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": ['*'], @@ -773,7 +773,7 @@ ostree = { "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 diff --git a/nightly.sh b/nightly.sh index 41a9b83..e447c2a 100755 --- a/nightly.sh +++ b/nightly.sh @@ -4,16 +4,16 @@ 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="39" RELEASE_TITLE="Rawhide" -COMPSFILE="comps-rawhide.xml" +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 " @@ -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