From 2ce4e4fd6467ddc13201302f7e0d0b4563041e19 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Tue, 4 Oct 2016 20:40:33 -0500
Subject: [PATCH] fix up the beta config to validae with pungi 4.1.9

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
---
 fedora-beta.conf | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/fedora-beta.conf b/fedora-beta.conf
index a20b4af..41c4863 100644
--- a/fedora-beta.conf
+++ b/fedora-beta.conf
@@ -42,8 +42,6 @@ pkgset_source = 'koji' # koji, repos
 # pkgset_repos = {}
 
 # PKGSET - KOJI
-pkgset_koji_path_prefix = '/mnt/koji/'
-pkgset_koji_url = 'http://koji.fedoraproject.org/kojihub'
 pkgset_koji_tag = 'f25-compose'
 pkgset_koji_inherit = True
 
@@ -63,10 +61,6 @@ greedy_method = 'build'
 #gather_source_mapping = '/path/to/mapping.json'
 
 
-link_files = 'hardlink-or-copy'
-
-notification_script = '/usr/bin/pungi-fedmsg-notification'
-
 # CREATEREPO
 createrepo_c = True
 createrepo_checksum = 'sha256'
@@ -75,7 +69,7 @@ createrepo_deltas = True
 # CHECKSUMS
 media_checksums = ['sha256']
 media_checksum_one_file = True
-media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-1.1-%(arch)s'
+media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-%(label)s-%(arch)s'
 #jigdo
 create_jigdo = False
 
@@ -235,7 +229,7 @@ createiso_skip = [
 #]
 
 # Image name respecting Fedora's image naming policy
-image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-1.1.iso'
+image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(label)s.iso'
 # # Use the same format for volume id
 image_volid_formats = [
      '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
@@ -284,11 +278,11 @@ global_target = 'f25'
 image_build = {
     '^Docker$': [
         {
-            'failable': ['*'],
             'image-build': {
                     'format': [('docker', 'tar.xz')]
                     'name': 'Fedora-Docker-Base',
                     'kickstart': 'fedora-docker-base.ks',
+                    'failable': ['*'],
                     'distro': 'Fedora-22',
                     'disk_size': 3,
                     'arches': ['x86_64', 'armhfp'],
@@ -300,11 +294,11 @@ image_build = {
         ],
     '^CloudImages$': [
         {
-            'failable': ['*'],
             'image-build': {
                     'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
                     'name': 'Fedora-Cloud-Base',
                     'kickstart': 'fedora-cloud-base.ks',
+                    'failable': ['*'],
                     'distro': 'Fedora-22',
                     'disk_size': 3,
                     'arches': ['x86_64'],
@@ -314,11 +308,11 @@ image_build = {
                      }
         },
         {
-            'failable': ['*'],
             'image-build': {
                     'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
                     'name': 'Fedora-Cloud-Base-Vagrant',
                     'kickstart': 'fedora-cloud-base-vagrant.ks',
+                    'failable': ['*'],
                     'distro': 'Fedora-22',
                     'disk_size': 40,
                     'arches': ['x86_64'],
@@ -564,7 +558,6 @@ ostree_installer = [
         "x86_64": {
             "source_repo_from": "Everything",
             "release": None,
-            "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(date)s.iso",
             "installpkgs": ["fedora-productimg-atomic"],
             "add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"],
             "add_template_var": [
@@ -585,5 +578,4 @@ ostree_installer = [
 ]
 
 
-release_id_allow_missing = True
 koji_profile = 'koji'