From 68cf8faa6636e1c09ed1df5f1dce370bea06d791 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mar 06 2020 16:28:35 +0000 Subject: Fix various versions to all be f32 for the f32 branch Signed-off-by: Kevin Fenzi --- diff --git a/cloud-nightly.sh b/cloud-nightly.sh index a6a75e5..39731c7 100755 --- a/cloud-nightly.sh +++ b/cloud-nightly.sh @@ -13,9 +13,9 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-Cloud" -RELEASE="29" -RELEASE_TITLE="29" -COMPSFILE="comps-f29.xml" +RELEASE="32" +RELEASE_TITLE="32" +COMPSFILE="comps-f32.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org" FROM="Fedora Branched Report " diff --git a/container-nightly.sh b/container-nightly.sh index a850a76..f2f2842 100755 --- a/container-nightly.sh +++ b/container-nightly.sh @@ -12,9 +12,9 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-Docker" -RELEASE="29" -RELEASE_TITLE="29" -COMPSFILE="comps-f29.xml" +RELEASE="32" +RELEASE_TITLE="32" +COMPSFILE="comps-f32.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org" FROM="Fedora Branched Report " diff --git a/fedora-cloud.conf b/fedora-cloud.conf index f498d7f..cb44721 100644 --- a/fedora-cloud.conf +++ b/fedora-cloud.conf @@ -1,7 +1,7 @@ # PRODUCT INFO release_name = 'Fedora-Cloud' release_short = 'Fedora-Cloud' -release_version = '29' +release_version = '32' release_is_layered = False skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"] # GENERAL SETTINGS @@ -10,8 +10,8 @@ comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', 'branch': 'master', - 'file': 'comps-f29.xml', - 'command': 'make comps-f29.xml' + 'file': 'comps-f32.xml', + 'command': 'make comps-f32.xml' } variants_file='variants-fedora.xml' sigkeys = ['429476B4'] # None = unsigned @@ -26,10 +26,10 @@ hashed_directories = True runroot = True #runroot_channel = 'fedora_compose' runroot_channel = 'compose' -runroot_tag = 'f29-build' +runroot_tag = 'f32-build' # PKGSET pkgset_source = 'koji' # koji, repos -pkgset_koji_tag = 'f29-updates' +pkgset_koji_tag = 'f32-updates' pkgset_koji_inherit = True filter_system_release_packages = False # GATHER @@ -213,19 +213,19 @@ image_build = { 'image-build': { 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')], 'name': 'Fedora-Cloud-Base', - 'target': 'f29', - 'version': '29', + 'target': 'f32', + 'version': '32', 'release': None, - 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29', + 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f32', 'kickstart': 'fedora-cloud-base.ks', 'distro': 'Fedora-22', 'disk_size': 4, 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'repo': [ - 'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/' - 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/updates/f32-updates/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/' ], - 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/', + 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/', 'subvariant': 'Cloud_Base' } }, @@ -233,19 +233,19 @@ image_build = { 'image-build': { 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')] 'name': 'Fedora-Cloud-Base-Vagrant', - 'target': 'f29', - 'version': '29', + 'target': 'f32', + 'version': '32', 'release': None, - 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29', + 'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f32', 'kickstart': 'fedora-cloud-base-vagrant.ks', 'distro': 'Fedora-22', 'disk_size': 40, 'arches': ['x86_64'], 'repo': [ - 'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/' - 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/updates/f32-updates/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/' ], - 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/', + 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/', 'subvariant': 'Cloud_Base', } }, diff --git a/fedora-container.conf b/fedora-container.conf index 95ad16b..b1990d0 100644 --- a/fedora-container.conf +++ b/fedora-container.conf @@ -1,7 +1,7 @@ # PRODUCT INFO release_name = 'Fedora-Container' release_short = 'Fedora-Container' -release_version = '29' +release_version = '32' release_is_layered = False skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"] # GENERAL SETTINGS @@ -10,8 +10,8 @@ comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', 'branch': 'master', - 'file': 'comps-f29.xml', - 'command': 'make comps-f29.xml' + 'file': 'comps-f32.xml', + 'command': 'make comps-f32.xml' } variants_file='variants-fedora.xml' sigkeys = ['429476B4'] # None = unsigned @@ -26,10 +26,10 @@ hashed_directories = True runroot = True #runroot_channel = 'fedora_compose' runroot_channel = 'compose' -runroot_tag = 'f29-build' +runroot_tag = 'f32-build' # PKGSET pkgset_source = 'koji' # koji, repos -pkgset_koji_tag = 'f29-updates' +pkgset_koji_tag = 'f32-updates' pkgset_koji_inherit = True filter_system_release_packages = False # GATHER @@ -209,10 +209,10 @@ translate_paths = [ ] # These will be inherited by live_media, live_images and image_build -global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29' +global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f32' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' -global_version = '29' -global_target = 'f29' +global_version = '32' +global_target = 'f32' image_build = { '^Container$': [ @@ -224,18 +224,18 @@ image_build = { 'distro': 'Fedora-22', 'disk_size': 5, 'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'], - 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/', + 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/', 'repo': [ - 'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/' - 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/updates/f32-updates/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/' ], 'subvariant': 'Container_Base' }, 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f29container", "FGC=f29", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}', + 'docker_env': '[ "DISTTAG=f32container", "FGC=f32", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "32"}', }, }, { @@ -246,18 +246,18 @@ image_build = { 'distro': 'Fedora-22', 'disk_size': 5, 'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'], - 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/', + 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/', 'repo': [ - 'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/' - 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/updates/f32-updates/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/32/latest-Fedora-32/compose/Everything/$arch/os/' ], 'subvariant': 'Container_Minimal_Base', }, 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f29container", "FGC=f29", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}', + 'docker_env': '[ "DISTTAG=f32container", "FGC=f32", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "32"}', }, } ], diff --git a/fedora.conf b/fedora.conf index dceadfb..4757d14 100644 --- a/fedora.conf +++ b/fedora.conf @@ -289,7 +289,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_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f32' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_version = '32' # live_images ignores this in favor of live_target