diff --git a/fedora-iot.conf b/fedora-iot.conf index 535fc74..7a10578 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -1,10 +1,10 @@ # PRODUCT INFO release_name = 'Fedora-IoT' release_short = 'Fedora-IoT' -release_version = '31' +release_version = '32' release_is_layered = False # Let's not build install media during this run. For the image builds -# and OSTree installer we'll use inputs from other f31 runs. +# and OSTree installer we'll use inputs from other f32 runs. skip_phases = ["buildinstall", "productimg", "extra_files"] ostree_installer_overwrite = True @@ -14,8 +14,8 @@ comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', 'branch': 'master', - 'file': 'comps-f31.xml', - 'command': 'make comps-f31.xml' + 'file': 'comps-f32.xml', + 'command': 'make comps-f32.xml' } variants_file='variants-fedora.xml' sigkeys = ['3C3359C4'] @@ -29,7 +29,7 @@ hashed_directories = True # RUNROOT settings runroot = True runroot_channel = 'compose' -runroot_tag = 'f31-build' +runroot_tag = 'f32-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -38,8 +38,8 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -#pkgset_koji_tag = 'f31-atomic' -pkgset_koji_tag = 'f31-iot' +#pkgset_koji_tag = 'f32-atomic' +pkgset_koji_tag = 'f32-iot' pkgset_koji_inherit = False filter_system_release_packages = False @@ -207,9 +207,9 @@ 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 = '31' +global_version = '32' # live_images ignores this in favor of live_target -global_target = 'f31' +global_target = 'f32' image_build = { '^IoT$': [ { @@ -285,7 +285,7 @@ ostree_installer = [ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_update_repo=https://ostree.fedoraproject.org/iot/", "ostree_osname=fedora-iot", - "ostree_oskey=fedora-31", + "ostree_oskey=fedora-32", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", "ostree_install_ref=fedora/rawhide/aarch64/iot", "ostree_update_ref=fedora/rawhide/aarch64/iot", @@ -305,7 +305,7 @@ ostree_installer = [ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_update_repo=https://ostree.fedoraproject.org/iot/", "ostree_osname=fedora-iot", - "ostree_oskey=fedora-31", + "ostree_oskey=fedora-32", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", "ostree_install_ref=fedora/rawhide/armhfp/iot", "ostree_update_ref=fedora/rawhide/armhfp/iot", @@ -325,7 +325,7 @@ ostree_installer = [ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/iot/repo/", "ostree_update_repo=https://ostree.fedoraproject.org/iot/", "ostree_osname=fedora-iot", - "ostree_oskey=fedora-31", + "ostree_oskey=fedora-32", "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", "ostree_install_ref=fedora/rawhide/x86_64/iot", "ostree_update_ref=fedora/rawhide/x86_64/iot", diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 70d1569..fa59364 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -11,9 +11,9 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-IoT" -RELEASE="31" -RELEASE_TITLE="31" -COMPSFILE="comps-f31.xml" +RELEASE="32" +RELEASE_TITLE="32" +COMPSFILE="comps-f32.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report "