#495 f27: container: update to f27
Merged 7 years ago by puiterwijk. Opened 7 years ago by dustymabe.
dustymabe/pungi-fedora dusty-f27  into  f27

file modified
+21 -21
@@ -1,21 +1,21 @@ 

  # PRODUCT INFO

  release_name = 'Fedora-Docker'

  release_short = 'Fedora-Docker'

- release_version = '26'

+ release_version = '27'

  release_is_layered = False

  # GENERAL SETTINGS

  bootable = False

- comps_file = 'comps-f26.xml' #{

+ comps_file = 'comps-f27.xml' #{

  #    'scm': 'git',

  #    'repo': 'git://git.fedorahosted.org/git/comps.git',

  #    'branch': None, # defaults to cvs/HEAD or git/master

  #    'file': 'comps-f23.xml',

  #}

  variants_file='variants-fedora.xml'

- sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned

+ sigkeys = ['F5282EE4']

  # limit tree architectures

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

- tree_arches = ['x86_64', 'armhfp']

+ tree_arches = ['aarch64', 'armhfp', 'ppc64le', 'x86_64']

  # limit tree variants

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

  tree_variants = ['Docker']
@@ -24,10 +24,10 @@ 

  runroot = True

  #runroot_channel = 'fedora_compose'

  runroot_channel = 'compose'

- runroot_tag = 'f26-build'

+ runroot_tag = 'f27-build'

  # PKGSET

  pkgset_source = 'koji' # koji, repos

- pkgset_koji_tag = 'f26-updates'

+ pkgset_koji_tag = 'f27-updates'

  pkgset_koji_inherit = True

  filter_system_release_packages = False

  # GATHER
@@ -204,10 +204,10 @@ 

  ]

  

  # These will be inherited by live_media, live_images and image_build

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

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

  global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'

- global_version = '26'

- global_target = 'f26'

+ global_version = '27'

+ global_target = 'f27'

  

  image_build = {

      '^Docker$': [
@@ -218,19 +218,19 @@ 

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

                      'distro': 'Fedora-22',

                      'disk_size': 5,

-                     'arches': ['x86_64', 'armhfp'],

-                     'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',

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

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

                      'repo': [

-                         'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',

-                         'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',

+                         'https://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/27/$arch/',

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

                      ],

                      'subvariant': 'Docker_Base'

                      },

              'factory-parameters': {

                  'dockerversion': "1.10.1",

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

-                 'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',

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

+                 'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',

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

  

              },

          },
@@ -241,19 +241,19 @@ 

                      'kickstart': 'fedora-docker-base-minimal.ks',

                      'distro': 'Fedora-22',

                      'disk_size': 5,

-                     'arches': ['x86_64', 'armhfp'],

-                     'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',

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

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

                      'repo': [

-                         'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',

-                         'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',

+                         'https://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/27/$arch/',

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

                      ],

                      'subvariant': 'Container_Minimal_Base',

                      },

              'factory-parameters': {

                  'dockerversion': "1.10.1",

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

-                 'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',

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

+                 'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',

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

              },

          }

          ],

Two commits:

  • container: update to f27
  • container: add aarch64 and ppc64le to what gets built

Can you remove this line, its not a problem as its overwritten by next line, but better remove it.

rebased onto 332210d

7 years ago

Pull-Request has been merged by puiterwijk

7 years ago
Metadata