PR#1591: nomacboot option for livemedia koji tasks - pungi

pungi

#1591 nomacboot option for livemedia koji tasks

Merged 2 years ago by lsedlar. Opened 2 years ago by cobrien.

cobrien/pungi livemedia-nomacboot into master

project relies on black for formatting. ignore the .eggs dir

Christopher O'Brien • 2 years ago

985709b

nomacboot option for livemedia koji tasks

Christopher O'Brien • 2 years ago

56774c6

.gitignore

file modified

		`@@ -11,6 +11,7 @@`
		`tests/_composes`
		`htmlcov/`
		`.coverage`
		`+ .eggs`
		`.idea/`
		`.tox`
		`.venv`

doc/configuration.rst

file modified

		`@@ -1451,6 +1451,7 @@`
		* ``repo`` (str\|[str]) -- repos specified by URL or variant UID
		* ``title`` (str)
		* ``install_tree_from`` (str) -- variant to take install tree from
		+ * ``nomacboot`` (bool)


		`Image Build Settings`

pungi/checks.py

file modified

		`@@ -981,6 +981,7 @@`
		`"arches": {"$ref": "#/definitions/list_of_strings"},`
		`"failable": {"$ref": "#/definitions/list_of_strings"},`
		`"release": {"$ref": "#/definitions/optional_string"},`
		`+ "nomacboot": {"type": "boolean"},`
		`},`
		`"required": ["name", "kickstart"],`
		`"additionalProperties": False,`

pungi/phases/livemedia_phase.py

file modified

		`@@ -71,6 +71,7 @@`
		`"ksurl": self.get_ksurl(image_conf),`
		`"ksversion": image_conf.get("ksversion"),`
		`"scratch": image_conf.get("scratch", False),`
		`+ "nomacboot": image_conf.get("nomacboot", False),`
		`"release": self.get_release(image_conf),`
		`"skip_tag": image_conf.get("skip_tag"),`
		`"name": name,`

pungi/wrappers/kojiwrapper.py

file modified

		`@@ -391,6 +391,9 @@`
		`if "can_fail" in options:`
		`cmd.append("--can-fail=%s" % ",".join(options["can_fail"]))`

		`+ if options.get("nomacboot"):`
		`+ cmd.append("--nomacboot")`
		`+`
		`if wait:`
		`cmd.append("--wait")`

tests/test_livemediaphase.py

file modified

+11

		`@@ -60,6 +60,7 @@`
		`"version": "Rawhide",`
		`"subvariant": "Server",`
		`"failable_arches": [],`
		`+ "nomacboot": False,`
		`},`
		`)`
		`)`
		`@@ -116,6 +117,7 @@`
		`"version": "Rawhide",`
		`"subvariant": "Server",`
		`"failable_arches": ["amd64", "x86_64"],`
		`+ "nomacboot": False,`
		`},`
		`)`
		`)`
		`@@ -178,6 +180,7 @@`
		`"version": "Rawhide",`
		`"subvariant": "Server",`
		`"failable_arches": [],`
		`+ "nomacboot": False,`
		`},`
		`)`
		`),`
		`@@ -201,6 +204,7 @@`
		`"version": "Rawhide",`
		`"subvariant": "Server",`
		`"failable_arches": [],`
		`+ "nomacboot": False,`
		`},`
		`)`
		`),`
		`@@ -224,6 +228,7 @@`
		`"version": "25",`
		`"subvariant": "Server",`
		`"failable_arches": [],`
		`+ "nomacboot": False,`
		`},`
		`)`
		`),`
		`@@ -286,6 +291,7 @@`
		`"version": "Rawhide",`
		`"subvariant": "Server",`
		`"failable_arches": [],`
		`+ "nomacboot": False,`
		`},`
		`)`
		`),`
		`@@ -309,6 +315,7 @@`
		`"version": "Rawhide",`
		`"subvariant": "Server",`
		`"failable_arches": [],`
		`+ "nomacboot": False,`
		`},`
		`)`
		`),`
		`@@ -332,6 +339,7 @@`
		`"version": "25",`
		`"subvariant": "Server",`
		`"failable_arches": [],`
		`+ "nomacboot": False,`
		`},`
		`)`
		`),`
		`@@ -423,6 +431,7 @@`
		`"install_tree_from": "Server-optional",`
		`"subvariant": "Something",`
		`"failable": ["*"],`
		`+ "nomacboot": True,`
		`}`
		`]`
		`}`
		`@@ -436,6 +445,7 @@`

		`phase.run()`
		`self.assertTrue(phase.pool.add.called)`
		`+`
		`self.assertEqual(`
		`phase.pool.queue_put.call_args_list,`
		`[`
		`@@ -464,6 +474,7 @@`
		`"version": "25",`
		`"subvariant": "Something",`
		`"failable_arches": ["x86_64"],`
		`+ "nomacboot": True,`
		`},`
		`)`
		`)`

cobrien commented 2 years ago

The koji spin-livemedia task supports a --nomacboot option. This adds a nomacboot boolean configuration to the live_media variant section which results in that CLI option being passed along to the koji invocation.

Signed-off-by: Christopher O'Brien cobrien@redhat.com

lsedlar commented 2 years ago

The change looks good to me.

Jenkins is currently down for some reason. I ran the tests locally and they pass. I feel black will have some issues with some of the extra empty lines, but we can fix that later when Jenkins is back.

fdiprete commented 2 years ago

Is Jenkins back up ?

hlin commented 2 years ago

Pretty please pagure-ci rebuild

hlin commented 2 years ago

Jenkins job was triggered https://jenkins-fedora-infra.apps.ocp.ci.centos.org/job/pungi/1870/console but the result did not sent back here.

fdiprete commented 2 years ago

flake8: commands succeeded
ERROR: black: commands failed
py3: commands succeeded
Build step 'Execute shell' marked build as failure
Sending e-mails to: lsedlar@redhat.com
Finished: FAILURE

1 new commit added

cowtow to black's bad opinions, and ignore the .eggs dir

2 years ago

2 new commits added

project relies on black for formatting. ignore the .eggs dir
nomacboot option for livemedia koji tasks

2 years ago

pretty please pagure-ci rebuild

2 years ago

cobrien commented 2 years ago

Made black happy.
https://jenkins-fedora-infra.apps.ocp.ci.centos.org/job/pungi/1872/

fdiprete commented 2 years ago

pretty please pagure-ci rebuild

2 years ago

lsedlar commented 2 years ago

Looks good to me. :thumbsup:

lsedlar commented 2 years ago

Commit d557708 fixes this pull-request

Pull-Request has been merged by lsedlar

2 years ago

Metadata

Assignee

None

Tags

No Tags

Changes Summary 6

doc/configuration.rst

pungi/phases/livemedia_phase.py

+3 -0

file changed

pungi/wrappers/kojiwrapper.py

+11 -0

file changed

tests/test_livemediaphase.py

		`@@ -1451,6 +1451,7 @@`
		* ``repo`` (str\|[str]) -- repos specified by URL or variant UID
		* ``title`` (str)
		* ``install_tree_from`` (str) -- variant to take install tree from
		+ * ``nomacboot`` (bool)


		`Image Build Settings`

pungi

Source Code

Documentation

#1591 nomacboot option for livemedia koji tasks Merged 2 years ago by lsedlar. Opened 2 years ago by cobrien. cobrien/pungi livemedia-nomacboot into master

Metadata

Changes Summary 6

#1591 nomacboot option for livemedia koji tasks

Merged 2 years ago by lsedlar. Opened 2 years ago by cobrien.

cobrien/pungi livemedia-nomacboot into master