almalinux
/
pungi
15
1
Fork 0
Code Issues Pull Requests Releases Activity

default "with_jigdo" to False 

Fedora has not composed with jigdo in a long time. Disable it by
default.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Merges: https://pagure.io/pungi/pull-request/1561
Fixes: https://pagure.io/pungi/issue/1560
This commit is contained in:
Ken Dreyer 2021-11-01 16:08:30 -04:00 committed by lsedlar
parent 9d02f87c99
commit 94ffa1c5c6
7 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/configuration.rst
View File

@ -1240,7 +1240,7 @@ Options
Format: ``[(variant_uid_regex, {arch|*: bool})]`` Format: ``[(variant_uid_regex, {arch|*: bool})]``
**create_jigdo** = True **create_jigdo** = False
(*bool*) -- controls the creation of jigdo from ISO (*bool*) -- controls the creation of jigdo from ISO
**create_optional_isos** = False **create_optional_isos** = False

1
doc/examples.rst
View File

@ -83,7 +83,6 @@ This is a shortened configuration for Fedora Radhide compose as of 2019-10-14.
# CREATEISO # CREATEISO
iso_hfs_ppc64le_compatible = False iso_hfs_ppc64le_compatible = False
create_jigdo = False
# BUILDINSTALL # BUILDINSTALL
buildinstall_method = 'lorax' buildinstall_method = 'lorax'

4
pungi/checks.py
View File

@ -53,7 +53,7 @@ from . import util
def is_jigdo_needed(conf): def is_jigdo_needed(conf):
return conf.get("create_jigdo", True) return conf.get("create_jigdo", False)
def is_isohybrid_needed(conf): def is_isohybrid_needed(conf):
@ -609,7 +609,7 @@ def make_schema():
"runroot_ssh_init_template": {"type": "string"}, "runroot_ssh_init_template": {"type": "string"},
"runroot_ssh_install_packages_template": {"type": "string"}, "runroot_ssh_install_packages_template": {"type": "string"},
"runroot_ssh_run_template": {"type": "string"}, "runroot_ssh_run_template": {"type": "string"},
"create_jigdo": {"type": "boolean", "default": True}, "create_jigdo": {"type": "boolean", "default": False},
"check_deps": {"type": "boolean", "default": True}, "check_deps": {"type": "boolean", "default": True},
"require_all_comps_packages": {"type": "boolean", "default": False}, "require_all_comps_packages": {"type": "boolean", "default": False},
"bootable": { "bootable": {

2
pungi/phases/createiso.py
View File

@ -518,7 +518,7 @@ def add_iso_to_metadata(
def run_createiso_command( def run_createiso_command(
num, compose, bootable, arch, cmd, mounts, log_file, with_jigdo=True num, compose, bootable, arch, cmd, mounts, log_file, with_jigdo=False
): ):
packages = [ packages = [
"coreutils", "coreutils",

2
tests/data/dummy-pungi.conf
View File

@ -109,5 +109,3 @@ extra_isos = {
'filename': 'extra-{filename}', 'filename': 'extra-{filename}',
}] }]
} }
create_jigdo = False

23
tests/test_createiso_phase.py
View File

@ -120,8 +120,8 @@ class CreateisoPhaseTest(helpers.PungiTestCase):
graft_points="dummy-graft-points", graft_points="dummy-graft-points",
arch="x86_64", arch="x86_64",
supported=True, supported=True,
jigdo_dir="%s/compose/Server/x86_64/jigdo" % self.topdir, jigdo_dir=None,
os_tree="%s/compose/Server/x86_64/os" % self.topdir, os_tree=None,
hfs_compat=True, hfs_compat=True,
use_xorrisofs=False, use_xorrisofs=False,
) )
@ -246,8 +246,8 @@ class CreateisoPhaseTest(helpers.PungiTestCase):
arch="x86_64", arch="x86_64",
buildinstall_method="lorax", buildinstall_method="lorax",
supported=True, supported=True,
jigdo_dir="%s/compose/Server/x86_64/jigdo" % self.topdir, jigdo_dir=None,
os_tree="%s/compose/Server/x86_64/os" % self.topdir, os_tree=None,
hfs_compat=True, hfs_compat=True,
use_xorrisofs=False, use_xorrisofs=False,
), ),
@ -258,8 +258,8 @@ class CreateisoPhaseTest(helpers.PungiTestCase):
graft_points="dummy-graft-points", graft_points="dummy-graft-points",
arch="src", arch="src",
supported=True, supported=True,
jigdo_dir="%s/compose/Server/source/jigdo" % self.topdir, jigdo_dir=None,
os_tree="%s/compose/Server/source/tree" % self.topdir, os_tree=None,
hfs_compat=True, hfs_compat=True,
use_xorrisofs=False, use_xorrisofs=False,
), ),
@ -390,8 +390,8 @@ class CreateisoPhaseTest(helpers.PungiTestCase):
graft_points="dummy-graft-points", graft_points="dummy-graft-points",
arch="src", arch="src",
supported=True, supported=True,
jigdo_dir="%s/compose/Server/source/jigdo" % self.topdir, jigdo_dir=None,
os_tree="%s/compose/Server/source/tree" % self.topdir, os_tree=None,
hfs_compat=True, hfs_compat=True,
use_xorrisofs=False, use_xorrisofs=False,
) )
@ -497,8 +497,8 @@ class CreateisoPhaseTest(helpers.PungiTestCase):
graft_points="dummy-graft-points", graft_points="dummy-graft-points",
arch="x86_64", arch="x86_64",
supported=True, supported=True,
jigdo_dir="%s/compose/Server/x86_64/jigdo" % self.topdir, jigdo_dir=None,
os_tree="%s/compose/Server/x86_64/os" % self.topdir, os_tree=None,
hfs_compat=False, hfs_compat=False,
use_xorrisofs=False, use_xorrisofs=False,
) )
@ -580,7 +580,7 @@ class CreateisoThreadTest(helpers.PungiTestCase):
cmd["cmd"], cmd["cmd"],
channel=None, channel=None,
mounts=[self.topdir], mounts=[self.topdir],
packages=["coreutils", "genisoimage", "isomd5sum", "jigdo"], packages=["coreutils", "genisoimage", "isomd5sum"],
use_shell=True, use_shell=True,
weight=None, weight=None,
) )
@ -750,7 +750,6 @@ class CreateisoThreadTest(helpers.PungiTestCase):
"coreutils", "coreutils",
"genisoimage", "genisoimage",
"isomd5sum", "isomd5sum",
"jigdo",
"lorax", "lorax",
"which", "which",
], ],

8
tests/test_extra_isos_phase.py
View File

@ -148,7 +148,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
log_file=os.path.join( log_file=os.path.join(
self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log" self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
), ),
with_jigdo=True, with_jigdo=False,
) )
], ],
) )
@ -298,7 +298,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
log_file=os.path.join( log_file=os.path.join(
self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log" self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
), ),
with_jigdo=True, with_jigdo=False,
) )
], ],
) )
@ -374,7 +374,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
log_file=os.path.join( log_file=os.path.join(
self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log" self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
), ),
with_jigdo=True, with_jigdo=False,
) )
], ],
) )
@ -445,7 +445,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
log_file=os.path.join( log_file=os.path.join(
self.topdir, "logs/src/extraiso-my.iso.src.log" self.topdir, "logs/src/extraiso-my.iso.src.log"
), ),
with_jigdo=True, with_jigdo=False,
) )
], ],
) )