#1100 Update version for cloud and container
Merged 2 years ago by mohanboddu. Opened 2 years ago by humaton.
humaton/pungi-fedora f36_cloud_container  into  f36

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="35"

- RELEASE_TITLE="35"

- COMPSFILE="comps-f35.xml"

+ RELEASE="36"

+ RELEASE_TITLE="36"

+ COMPSFILE="comps-f36.xml"

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

  TOMAIL="devel@lists.fedoraproject.org test@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="35"

- RELEASE_TITLE="35"

- COMPSFILE="comps-f35.xml"

+ RELEASE="36"

+ RELEASE_TITLE="36"

+ COMPSFILE="comps-f36.xml"

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

  TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"

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

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

  # PRODUCT INFO

  release_name = 'Fedora-Cloud'

  release_short = 'Fedora-Cloud'

- release_version = '35'

+ release_version = '36'

  release_is_layered = False

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

  # GENERAL SETTINGS
@@ -10,8 +10,8 @@ 

      'scm': 'git',

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

      'branch': 'main',

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

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

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

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

  }

  variants_file='variants-fedora.xml'

  sigkeys = ['429476B4'] # None = unsigned
@@ -26,10 +26,10 @@ 

  runroot = True

  #runroot_channel = 'fedora_compose'

  runroot_channel = 'compose'

- runroot_tag = 'f35-build'

+ runroot_tag = 'f36-build'

  # PKGSET

  pkgset_source = 'koji' # koji, repos

- pkgset_koji_tag = 'f35-updates'

+ pkgset_koji_tag = 'f36-updates'

  pkgset_koji_inherit = True

  filter_system_release_packages = False

  # GATHER
@@ -218,19 +218,19 @@ 

              'image-build': {

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

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

-                     'target': 'f35',

-                     'version': '35',

+                     'target': 'f36',

+                     'version': '36',

                      'release': None,

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

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

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

                      'distro': 'Fedora-22',

                      'disk_size': 4,

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

                      'repo': [

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

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

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

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

                      ],

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

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

                      'subvariant': 'Cloud_Base'

                       }

          },
@@ -238,19 +238,19 @@ 

              'image-build': {

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

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

-                     'target': 'f35',

-                     'version': '35',

+                     'target': 'f36',

+                     'version': '36',

                      'release': None,

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

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

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

                      'distro': 'Fedora-22',

                      'disk_size': 40,

                      'arches': ['x86_64'],

                      'repo': [

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

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

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

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

                      ],

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

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

                      'subvariant': 'Cloud_Base',

                       }

          },

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

  # PRODUCT INFO

  release_name = 'Fedora-Container'

  release_short = 'Fedora-Container'

- release_version = '35'

+ release_version = '36'

  release_is_layered = False

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

  # GENERAL SETTINGS
@@ -10,8 +10,8 @@ 

      'scm': 'git',

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

      'branch': 'main',

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

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

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

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

  }

  variants_file='variants-fedora.xml'

  sigkeys = ['429476B4'] # None = unsigned
@@ -26,10 +26,10 @@ 

  runroot = True

  #runroot_channel = 'fedora_compose'

  runroot_channel = 'compose'

- runroot_tag = 'f35-build'

+ runroot_tag = 'f36-build'

  # PKGSET

  pkgset_source = 'koji' # koji, repos

- pkgset_koji_tag = 'f35-updates'

+ pkgset_koji_tag = 'f36-updates'

  pkgset_koji_inherit = True

  filter_system_release_packages = False

  # GATHER
@@ -214,10 +214,10 @@ 

  ]

  

  # These will be inherited by live_media, live_images and image_build

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

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

  global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'

- global_version = '35'

- global_target = 'f35'

+ global_version = '36'

+ global_target = 'f36'

  

  image_build = {

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

                      'distro': 'Fedora-22',

                      'disk_size': 5,

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

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

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

                      'repo': [

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

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

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

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

                      ],

                      'subvariant': 'Container_Base'

                      },

              'factory-parameters': {

                  'dockerversion': "1.10.1",

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

-                 'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',

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

+                 'docker_env': '[ "DISTTAG=f36container", "FGC=f36", "container=oci" ]',

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

              },

          },

          {
@@ -251,18 +251,18 @@ 

                      'distro': 'Fedora-22',

                      'disk_size': 5,

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

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

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

                      'repo': [

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

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

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

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

                      ],

                      'subvariant': 'Container_Minimal_Base',

                      },

              'factory-parameters': {

                  'dockerversion': "1.10.1",

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

-                 'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',

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

+                 'docker_env': '[ "DISTTAG=f36container", "FGC=f36", "container=oci" ]',

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

              },

          }

          ],