PR#577: rm Cloud variant; mv CloudImages Cloud - pungi-fedora

pungi-fedora

#577 rm Cloud variant; mv CloudImages Cloud

Merged 6 years ago by ausil. Opened 6 years ago by dustymabe.

dustymabe/pungi-fedora dusty-no-more-cloud-variant into master

rm Cloud variant; mv CloudImages Cloud

Dusty Mabe • 6 years ago

6eecb53

fedora.conf: AtomicHost cloud images now go under AtomicHost dir

Dusty Mabe • 6 years ago

0613ee5

fedora.conf

file modified

+12 -21

		`@@ -106,7 +106,7 @@`

		`# fomat: [(variant_uid_regex, {arch\|*: [packages]})]`
		`additional_packages = [`
		`- ('^(Workstation\|Server\|Cloud\|Everything)$', {`
		`+ ('^(Workstation\|Server\|Everything)$', {`
		`'*': [`
		`'kernel*',`
		`'dracut*',`
		`@@ -140,12 +140,6 @@`
		`],`
		`}),`

		`- ('^Cloud$', {`
		`- '*': [`
		`-`
		`- ],`
		`- }),`
		`-`
		`]`

		`multilib = [`
		`@@ -155,7 +149,7 @@`
		`]`

		`filter_packages = [`
		`- ('(Workstation\|Server\|Cloud)$', {`
		`+ ('(Workstation\|Server)$', {`
		`'*': [`
		`'kerneldebug',`
		`'kernel-kdump*',`
		`@@ -207,11 +201,6 @@`
		`'src': True`
		`}),`

		`- ('^Cloud$', {`
		`- '*': True,`
		`- 'src': True`
		`- }),`
		`-`
		`('^Everything$', {`
		`'*': True,`
		`'src': True`
		`@@ -226,7 +215,7 @@`

		`# fomat: [(variant_uid_regex, {arch\|*: [scm_dicts]})]`
		`#extra_files = [`
		`- # ('^(Server\|Workstation\|Cloud)$', {`
		`+ # ('^(Server\|Workstation)$', {`
		`# '*': [`
		`# {`
		`# 'scm': 'rpm',`
		`@@ -341,7 +330,7 @@`
		`},`
		`}`
		`],`
		`- '^CloudImages$': [`
		`+ '^Cloud$': [`
		`{`
		`'image-build': {`
		`'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],`
		`@@ -350,8 +339,8 @@`
		`'distro': 'Fedora-22',`
		`'disk_size': 4,`
		`'arches': ['aarch64', 'ppc64', 'ppc64le', 's390x', 'x86_64'],`
		`- 'repo': 'Cloud',`
		`- 'install_tree_from': 'Cloud',`
		`+ 'repo': 'Everything',`
		`+ 'install_tree_from': 'Everything',`
		`'subvariant': 'Cloud_Base',`
		`'failable': ['ppc64', 'ppc64le', 's390x'],`
		`}`
		`@@ -364,12 +353,14 @@`
		`'distro': 'Fedora-22',`
		`'disk_size': 40,`
		`'arches': ['x86_64'],`
		`- 'repo': 'Cloud',`
		`- 'install_tree_from': 'Cloud',`
		`+ 'repo': 'Everything',`
		`+ 'install_tree_from': 'Everything',`
		`'subvariant': 'Cloud_Base',`
		`'failable': ['*'],`
		`},`
		`},`
		`+ ],`
		`+ '^AtomicHost$': [`
		`{`
		`'image-build': {`
		`'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],`
		`@@ -378,7 +369,7 @@`
		`'distro': 'Fedora-22',`
		`'disk_size': 6,`
		`'arches': ['aarch64', 'ppc64le', 'x86_64'],`
		`- 'install_tree_from': 'Cloud',`
		`+ 'install_tree_from': 'Everything',`
		`'subvariant': 'AtomicHost',`
		`'failable': ['*'],`
		`}`
		`@@ -391,7 +382,7 @@`
		`'distro': 'Fedora-22',`
		`'disk_size': 40,`
		`'arches': ['x86_64'],`
		`- 'install_tree_from': 'Cloud',`
		`+ 'install_tree_from': 'Everything',`
		`'subvariant': 'AtomicHost',`
		`'failable': ['*'],`
		`},`

variants-fedora.xml

file modified

+1 -39

		`@@ -8,10 +8,9 @@`
		`<arch>ppc64le</arch>`
		`</arches>`
		`</variant>`
		`- <variant id="CloudImages" name="CloudImages" type="variant" is_empty="true">`
		`+ <variant id="Cloud" name="Cloud" type="variant" is_empty="true">`
		`<arches>`
		`<arch>aarch64</arch>`
		`- <arch>i386</arch>`
		`<arch>ppc64</arch>`
		`<arch>ppc64le</arch>`
		`<arch>s390x</arch>`
		`@@ -134,43 +133,6 @@`
		`<arch>x86_64</arch>`
		`</arches>`
		`</variant>`
		`- <variant name="Cloud" id="Cloud" type="variant">`
		`- <arches>`
		`- <arch>aarch64</arch>`
		`- <arch>ppc64</arch>`
		`- <arch>ppc64le</arch>`
		`- <arch>s390x</arch>`
		`- <arch>x86_64</arch>`
		`- </arches>`
		`- <groups>`
		`- <group default="true">cloud-server</group>`
		`- <group default="true">core</group>`
		`- <group default="true">standard</group>`
		`- <group default="true">headless-management</group>`
		`- <group default="true">dogtag</group>`
		`- <group default="true">directory-server</group>`
		`- <group default="true">dns-server</group>`
		`- <group default="true">freeipa-server</group>`
		`- <group default="true">ftp-server</group>`
		`- <group default="true">guest-agents</group>`
		`- <group default="true">ha</group>`
		`- <group default="true">load-balancer</group>`
		`- <group default="true">mail-server</group>`
		`- <group default="true">mysql</group>`
		`- <group default="true">network-server</group>`
		`- <group default="true">smb-server</group>`
		`- <group default="true">sql-server</group>`
		`- <group default="true">web-server</group>`
		`- <!-- Things needed for installation -->`
		`- <group default="true">anaconda-tools</group>`
		`- <group default="true">platform-vmware</group>`
		`- <!-- Things needed for Atomic Host -->`
		`- <group default="true">ostree-support</group>`
		`- </groups>`
		`- <environments>`
		`- <environment display_order="10">cloud-server-environment</environment>`
		`- </environments>`
		`- </variant>`
		`<variant id="Modular" name="Modular" type="variant">`
		`<arches>`
		`<arch>armhfp</arch>`

dustymabe commented 6 years ago

Two commits in this PR:

rm Cloud variant; mv CloudImages Cloud
AtomicHost cloud images now go under AtomicHost dir

We need to stop building repos and install media for the Cloud variant
because the only consumers of those repos/install media is the cloud
base images that could easily be built with the Everything repo/install
media. This commit removes the cloud variant (as it was previously
known) and then renames the CloudImages variant to 'Cloud'.

Summary:

Cloud now becomes an empty variant (no repos, no install media)
CloudImages variant goes away
Cloud image builds use Everything repo/install media
Atomic image builds use Everything install tree

Pull-Request has been merged by ausil

6 years ago

dustymabe commented 6 years ago

This should also save us a few hours of compose time because we want have to "wait around" in some phases for s390x to complete the buildinstall/repos for s390x Cloud variant.

dustymabe commented 6 years ago

For example, from the logs for yesterday's run:

2018-03-10 02:17:23 [INFO    ] [DONE ] Running buildinstall for arch s390x, variant Cloud
2018-03-10 03:17:28 [INFO    ] [DONE ] Running buildinstall for arch s390x, variant Everything
2018-03-10 04:16:41 [INFO    ] [DONE ] Running buildinstall for arch s390x, variant Modular
2018-03-10 05:15:08 [INFO    ] [DONE ] Running buildinstall for arch s390x, variant Server
2018-03-10 05:15:08 [INFO    ] [DONE ] ---------- PHASE: BUILDINSTALL ----------

so there is 3 hours where we were waiting on s390x, removing cloud from this will at least same us some time there.

dustymabe commented 6 years ago

The reason s390x is slow for us is because of the cross country net connection/filesystem share.

ausil commented 6 years ago

This should save some time based on how /mnt/koji is setup to the remote hosts running s390x and teh number of s390x compose hosts, it is not a generic statement that changes like this would always save time