#1235 Rawhide is now f41
Merged 3 months ago by jnsamyak. Opened 3 months ago by jnsamyak.
jnsamyak/pungi-fedora main  into  main

file modified
+3 -3
@@ -13,9 +13,9 @@ 

  DATE=$(date "+%Y%m%d")

  # the Pungi 'shortname', which we will include in fedmsgs for disambiguation

  SHORT="Fedora-Cloud"

- RELEASE="40"

- RELEASE_TITLE="40"

- COMPSFILE="comps-f40.xml"

+ RELEASE="41"

+ RELEASE_TITLE="41"

+ COMPSFILE="comps-f41.xml"

  TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`

  TOMAIL="test-reports@lists.fedoraproject.org"

  FROM="Fedora Branched Report <rawhide@fedoraproject.org>"

file modified
+3 -3
@@ -12,9 +12,9 @@ 

  DATE=$(date "+%Y%m%d")

  # the Pungi 'shortname', which we will include in fedmsgs for disambiguation

  SHORT="Fedora-Docker"

- RELEASE="40"

- RELEASE_TITLE="40"

- COMPSFILE="comps-f40.xml"

+ RELEASE="41"

+ RELEASE_TITLE="41"

+ COMPSFILE="comps-f41.xml"

  TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`

  TOMAIL="test-reports@lists.fedoraproject.org"

  FROM="Fedora Branched Report <rawhide@fedoraproject.org>"

file modified
+23 -23
@@ -6,24 +6,24 @@ 

  # PRODUCT INFO

  release_name = 'Fedora-Cloud'

  release_short = 'Fedora-Cloud'

- release_version = '40'

+ release_version = '41'

  skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]

  # GENERAL SETTINGS

  comps_file = {

      'scm': 'git',

      'repo': 'https://pagure.io/fedora-comps.git',

      'branch': 'main',

-     'file': 'comps-f40.xml',

-     'command': 'make comps-f40.xml'

+     'file': 'comps-f41.xml',

+     'command': 'make comps-f41.xml'

  }

  variants_file='variants-fedora.xml'

- sigkeys = ['a15B79cc'] # None = unsigned

+ sigkeys = ['e99d6ad1'] # None = unsigned

  

  # limit tree variants

  # if undefined, all variants from variants.xml will be included

  tree_variants = ['Cloud']

  # PKGSET

- pkgset_koji_tag = 'f40-updates'

+ pkgset_koji_tag = 'f41-updates'

  pkgset_koji_inherit = True

  # GATHER

  gather_method = 'deps'
@@ -141,19 +141,19 @@ 

              'image-build': {

                      'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],

                      'name': 'Fedora-Cloud-Base',

-                     'target': 'f40',

-                     'version': '40',

+                     'target': 'f41',

+                     'version': '41',

                      'release': None,

-                     'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40',

+                     'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f41',

                      'kickstart': 'fedora-cloud-base.ks',

                      'distro': 'Fedora-22',

                      'disk_size': 4,

                      'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],

                      'repo': [

-                         'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'

-                         'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/' 

+                         'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/'

+                         'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/' 

                      ],

-                     'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',

+                     'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/',

                      'subvariant': 'Cloud_Base'

                       }

          },
@@ -161,19 +161,19 @@ 

              'image-build': {

                      'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]

                      'name': 'Fedora-Cloud-Base-Vagrant',

-                     'target': 'f40',

-                     'version': '40',

+                     'target': 'f41',

+                     'version': '41',

                      'release': None,

-                     'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40',

+                     'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f41',

                      'kickstart': 'fedora-cloud-base-vagrant.ks',

                      'distro': 'Fedora-22',

                      'disk_size': 40,

                      'arches': ['x86_64'],

                      'repo': [

-                         'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'

-                         'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/' 

+                         'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/'

+                         'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/' 

                      ],

-                     'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',

+                     'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/',

                      'subvariant': 'Cloud_Base',

                       }

          },
@@ -181,19 +181,19 @@ 

              'image-build': {

                      'format': [('vpc','vpc')],

                      'name': 'Fedora-Cloud-Base-Azure',

-                     'target': 'f40',

-                     'version': '40',

+                     'target': 'f41',

+                     'version': '41',

                      'release': None,

-                     'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40',

+                     'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f41',

                      'kickstart': 'fedora-cloud-base-azure.ks',

                      'distro': 'Fedora-30',

                      'disk_size': 10,

                      'arches': ['aarch64', 'x86_64'],

                      'repo': [

-                         'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'

-                         'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/' 

+                         'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/'

+                         'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/' 

                      ],

-                     'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',

+                     'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/',

                      'subvariant': 'Cloud_Base'

                       }

          },

file modified
+22 -22
@@ -6,22 +6,22 @@ 

  # PRODUCT INFO

  release_name = 'Fedora-Container'

  release_short = 'Fedora-Container'

- release_version = '40'

+ release_version = '41'

  skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]

  # GENERAL SETTINGS

  comps_file = {

      'scm': 'git',

      'repo': 'https://pagure.io/fedora-comps.git',

      'branch': 'main',

-     'file': 'comps-f40.xml',

-     'command': 'make comps-f40.xml'

+     'file': 'comps-f41.xml',

+     'command': 'make comps-f41.xml'

  }

- sigkeys = ['a15B79cc'] # None = unsigned

+ sigkeys = ['e99d6ad1'] # None = unsigned

  # limit tree variants

  # if undefined, all variants from variants.xml will be included

  tree_variants = ['Container']

  # PKGSET

- pkgset_koji_tag = 'f40-updates'

+ pkgset_koji_tag = 'f41-updates'

  pkgset_koji_inherit = True

  # GATHER

  gather_method = 'deps'
@@ -135,10 +135,10 @@ 

       ]

  

  # These will be inherited by live_media, live_images and image_build

- global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40'

+ global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f41'

  global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'

- global_version = '40'

- global_target = 'f40'

+ global_version = '41'

+ global_target = 'f41'

  

  image_build = {

      '^Container$': [
@@ -150,18 +150,18 @@ 

                      'distro': 'Fedora-22',

                      'disk_size': 5,

                      'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],

-                     'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',

+                     'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/',

                      'repo': [

-                         'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'

-                         'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'

+                         'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/'

+                         'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/'

                      ],

                      'subvariant': 'Container_Base'

                      },

              'factory-parameters': {

                  'dockerversion': "1.10.1",

                  'docker_cmd':  '[ "/bin/bash" ]',

-                 'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',

-                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',

+                 'docker_env': '[ "DISTTAG=f41container", "FGC=f41", "container=oci" ]',

+                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "41"}',

              },

          },

          {
@@ -172,18 +172,18 @@ 

                      'distro': 'Fedora-22',

                      'disk_size': 5,

                      'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],

-                     'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',

+                     'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/',

                      'repo': [

-                         'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'

-                         'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'

+                         'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/'

+                         'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/'

                      ],

                      'subvariant': 'Container_Minimal_Base',

                      },

              'factory-parameters': {

                  'dockerversion': "1.10.1",

                  'docker_cmd':  '[ "/bin/bash" ]',

-                 'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',

-                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',

+                 'docker_env': '[ "DISTTAG=f41container", "FGC=f41", "container=oci" ]',

+                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "41"}',

              },

          },

          {
@@ -194,10 +194,10 @@ 

                      'distro': 'Fedora-22',

                      'disk_size': 5,

                      'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],

-                     'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',

+                     'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/',

                      'repo': [

-                         'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'

-                         'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'

+                         'https://kojipkgs.fedoraproject.org/compose/updates/f41-updates/compose/Everything/$arch/os/'

+                         'https://kojipkgs.fedoraproject.org/compose/41/latest-Fedora-41/compose/Everything/$arch/os/'

                      ],

                      'subvariant': 'Container_Toolbox',

                      },
@@ -205,7 +205,7 @@ 

                  'dockerversion': "1.10.1",

                  'docker_cmd':  '[ "/bin/bash" ]',

                  'docker_env': '[ "container=oci" ]',

-                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40", "com.github.containers.toolbox": "true"}',

+                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "41", "com.github.containers.toolbox": "true"}',

              },

          }

          ],

file modified
+18 -18
@@ -18,7 +18,7 @@ 

  }

  

  variants_file='variants-fedora.xml'

- sigkeys = ['a15B79cc']

+ sigkeys = ['e99d6ad1']

  

  # limit tree variants

  # if undefined, all variants from variants.xml will be included
@@ -35,7 +35,7 @@ 

  # pkgset_repos = {}

  

  # PKGSET - KOJI

- pkgset_koji_tag = 'f40'

+ pkgset_koji_tag = 'f41'

  pkgset_koji_inherit = False

  

  # GATHER
@@ -201,7 +201,7 @@ 

  global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'

  global_version = 'Rawhide'

  # live_images ignores this in favor of live_target

- global_target = 'f40'

+ global_target = 'f41'

  

  image_build = {

      '^Container$': [
@@ -221,8 +221,8 @@ 

              'factory-parameters': {

                  'dockerversion': "1.10.1",

                  'docker_cmd':  '[ "/bin/bash" ]',

-                 'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',

-                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',

+                 'docker_env': '[ "DISTTAG=f41container", "FGC=f41", "container=oci" ]',

+                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "41"}',

              },

          },

          {
@@ -241,8 +241,8 @@ 

              'factory-parameters': {

                  'dockerversion': "1.10.1",

                  'docker_cmd':  '[ "/bin/bash" ]',

-                 'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',

-                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',

+                 'docker_env': '[ "DISTTAG=f41container", "FGC=f41", "container=oci" ]',

+                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "41"}',

              },

          },

          {
@@ -262,7 +262,7 @@ 

                  'dockerversion': "1.10.1",

                  'docker_cmd':  '[ "/bin/bash" ]',

                  'docker_env': '[ "container=oci" ]',

-                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40", "com.github.containers.toolbox": "true"}',

+                 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "41", "com.github.containers.toolbox": "true"}',

              },

          }

          ],
@@ -339,7 +339,7 @@ 

                      'name': 'Fedora-Python-Classroom-Vagrant',

                      'kickstart': 'fedora-python-classroom-vagrant.ks',

                      'distro': 'Fedora-22',

-                     'disk_size': 40,

+                     'disk_size': 41,

                      'arches': ['x86_64'],

                      'repo': 'Everything',

                      'install_tree_from': 'Everything',
@@ -356,7 +356,7 @@ 

                      'name': 'Fedora-Scientific-Vagrant',

                      'kickstart': 'fedora-scientific-vagrant.ks',

                      'distro': 'Fedora-22',

-                     'disk_size': 40,

+                     'disk_size': 41,

                      'arches': ['x86_64'],

                      'repo': 'Everything',

                      'install_tree_from': 'Everything',
@@ -828,7 +828,7 @@ 

                  "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",

                  "ostree_update_repo=https://ostree.fedoraproject.org",

                  "ostree_osname=fedora",

-                 "ostree_oskey=fedora-40-primary",

+                 "ostree_oskey=fedora-41-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",
@@ -856,7 +856,7 @@ 

                  "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",

                  "ostree_update_repo=https://ostree.fedoraproject.org",

                  "ostree_osname=fedora",

-                 "ostree_oskey=fedora-40-primary",

+                 "ostree_oskey=fedora-41-primary",

                  "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",

                  "ostree_install_ref=fedora/rawhide/ppc64le/silverblue",

                  "ostree_update_ref=fedora/rawhide/ppc64le/silverblue",
@@ -884,7 +884,7 @@ 

                  "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",

                  "ostree_update_repo=https://ostree.fedoraproject.org",

                  "ostree_osname=fedora",

-                 "ostree_oskey=fedora-40-primary",

+                 "ostree_oskey=fedora-41-primary",

                  "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",

                  "ostree_install_ref=fedora/rawhide/aarch64/silverblue",

                  "ostree_update_ref=fedora/rawhide/aarch64/silverblue",
@@ -914,7 +914,7 @@ 

                  "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",

                  "ostree_update_repo=https://ostree.fedoraproject.org",

                  "ostree_osname=fedora",

-                 "ostree_oskey=fedora-40-primary",

+                 "ostree_oskey=fedora-41-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",
@@ -942,7 +942,7 @@ 

                  "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",

                  "ostree_update_repo=https://ostree.fedoraproject.org",

                  "ostree_osname=fedora",

-                 "ostree_oskey=fedora-40-primary",

+                 "ostree_oskey=fedora-41-primary",

                  "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",

                  "ostree_install_ref=fedora/rawhide/ppc64le/kinoite",

                  "ostree_update_ref=fedora/rawhide/ppc64le/kinoite",
@@ -970,7 +970,7 @@ 

                  "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",

                  "ostree_update_repo=https://ostree.fedoraproject.org",

                  "ostree_osname=fedora",

-                 "ostree_oskey=fedora-40-primary",

+                 "ostree_oskey=fedora-41-primary",

                  "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",

                  "ostree_install_ref=fedora/rawhide/aarch64/kinoite",

                  "ostree_update_ref=fedora/rawhide/aarch64/kinoite",
@@ -999,7 +999,7 @@ 

                  "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",

                  "ostree_update_repo=https://ostree.fedoraproject.org",

                  "ostree_osname=fedora",

-                 "ostree_oskey=fedora-40-primary",

+                 "ostree_oskey=fedora-41-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",
@@ -1027,7 +1027,7 @@ 

                  "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",

                  "ostree_update_repo=https://ostree.fedoraproject.org",

                  "ostree_osname=fedora",

-                 "ostree_oskey=fedora-40-primary",

+                 "ostree_oskey=fedora-41-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",

file modified
+1 -1
@@ -9,7 +9,7 @@ 

  

  # RUNROOT settings

  runroot_channel = 'compose'

- runroot_tag = 'f40-build'

+ runroot_tag = 'f41-build'

  

  # PKGSET

  pkgset_source = 'koji' # koji, repos

file modified
+2 -2
@@ -217,8 +217,8 @@ 

  # Push rawhide ostree base container image to fedora registry

  pushd ./releng

  pushd ./scripts

- ./sync-latest-container-base-image.sh 40

- ./sync-ostree-base-containers.sh 40

+ ./sync-latest-container-base-image.sh 41

+ ./sync-ostree-base-containers.sh 41

  popd

  popd

  

This PR should be merged not before the mass branching is scheduled;

For the review check for the following:

  • RELEASE, RELEASE_TITLE, COMPSFILE (all these points to rawhide version) which is f41 now
  • the signing key to verify for f41 which on checking ansible repo turns out to be e99d6ad1

Signed-off-by: Samyak Jain samyak.jn11@gmail.com

no need to increase disk size here. ;)

ditto for these. ;)

Otherwise looks good.

rebased onto 95b6b1f

3 months ago

Pull-Request has been merged by jnsamyak

3 months ago