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

pungi-fedora

#579 f28: 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 f28

nightly.sh: Fixup syncing for Cloud/CloudImages change

Dusty Mabe • 6 years ago

d4b2a84

rm Cloud variant; mv CloudImages Cloud

Dusty Mabe • 6 years ago

dad1556

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

Dusty Mabe • 6 years ago

076343d

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`
		`@@ -221,7 +210,7 @@`

		`# fomat: [(variant_uid_regex, {arch\|*: [scm_dicts]})]`
		`#extra_files = [`
		`- # ('^(Server\|Workstation\|Cloud)$', {`
		`+ # ('^(Server\|Workstation)$', {`
		`# '*': [`
		`# {`
		`# 'scm': 'rpm',`
		`@@ -336,7 +325,7 @@`
		`},`
		`}`
		`],`
		`- '^CloudImages$': [`
		`+ '^Cloud$': [`
		`{`
		`'image-build': {`
		`'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],`
		`@@ -345,8 +334,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': ['aarch64', 'ppc64', 'ppc64le', 's390x'],`
		`}`
		`@@ -359,12 +348,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')],`
		`@@ -373,7 +364,7 @@`
		`'distro': 'Fedora-22',`
		`'disk_size': 6,`
		`'arches': ['aarch64', 'ppc64le', 'x86_64'],`
		`- 'install_tree_from': 'Cloud',`
		`+ 'install_tree_from': 'Everything',`
		`'subvariant': 'AtomicHost',`
		`'failable': ['*'],`
		`}`
		`@@ -386,7 +377,7 @@`
		`'distro': 'Fedora-22',`
		`'disk_size': 40,`
		`'arches': ['x86_64'],`
		`- 'install_tree_from': 'Cloud',`
		`+ 'install_tree_from': 'Everything',`
		`'subvariant': 'AtomicHost',`
		`'failable': ['*'],`
		`},`

nightly.sh

file modified

+12 -12

		`@@ -110,23 +110,23 @@`
		`fi`
		`$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \`
		`"$DESTDIR" "$RSYNCTARGET/" \`
		`- --variant Everything --variant AtomicHost --variant CloudImages --variant Container \`
		`+ --variant Everything --variant AtomicHost --variant Cloud --variant Container \`
		`--variant Server --variant Spins --variant Workstation --variant AtomicWorkstation --variant Modular \`
		`--link-dest="$RSYNCTARGET/Everything" --exclude=repodata`
		`$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \`
		`"$DESTDIR" "$RSYNCTARGET/" \`
		`- --variant Everything --variant AtomicHost --variant CloudImages --variant Container \`
		`+ --variant Everything --variant AtomicHost --variant Cloud --variant Container \`
		`--variant Server --variant Spins --variant Workstation --variant AtomicWorkstation --variant Modular \`
		`--link-dest="$RSYNCTARGET/Everything" --delete-after`
		`- # aarch64 for Everything Server CloudImages Container is primary`
		`+ # aarch64 for Everything Server Cloud Container is primary`
		`$RSYNCPREFIX compose-partial-copy --arch=aarch64 \`
		`"$DESTDIR" "$RSYNCTARGET/" \`
		`- --variant Everything --variant Server --variant CloudImages --variant Container \`
		`+ --variant Everything --variant Server --variant Cloud --variant Container \`
		`--variant Modular \`
		`--link-dest="$RSYNCTARGET/Everything" --exclude=repodata`
		`$RSYNCPREFIX compose-partial-copy --arch=aarch64 \`
		`"$DESTDIR" "$RSYNCTARGET/" \`
		`- --variant Everything --variant Server --variant CloudImages --variant Container \`
		`+ --variant Everything --variant Server --variant Cloud --variant Container \`
		`--variant Modular \`
		`--link-dest="$RSYNCTARGET/Everything" --delete-after`
		`$RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"`
		`@@ -138,11 +138,11 @@`
		`fi`
		`$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \`
		`"$DESTDIR" "$RSYNCALTTARGET/" \`
		`- --variant Cloud --variant Labs \`
		`+ --variant Labs \`
		`--link-dest="$RSYNCTARGET/Everything/" --exclude=repodata`
		`$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \`
		`"$DESTDIR" "$RSYNCALTTARGET/" \`
		`- --variant Cloud --variant Labs \`
		`+ --variant Labs \`
		`--link-dest="$RSYNCTARGET/Everything/" --delete-after`
		`$RSYNCPREFIX rm "$RSYNCALTTARGET/.composeinfo"`
		`$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCALTTARGET/" --name "$NEWCOMPOSE_ID"`
		`@@ -153,22 +153,22 @@`
		`fi`
		`$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \`
		`"$DESTDIR" "$RSYNCSECTARGET/" \`
		`- --variant AtomicHost --variant Cloud --variant CloudImages --variant Container \`
		`+ --variant AtomicHost --variant Cloud --variant Container \`
		`--variant Labs --variant Spins --variant Workstation --variant Modular \`
		`--link-dest="$RSYNCTARGET/Everything/" --exclude=repodata`
		`$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \`
		`"$DESTDIR" "$RSYNCSECTARGET/" \`
		`- --variant AtomicHost --variant Cloud --variant CloudImages --variant Container \`
		`+ --variant AtomicHost --variant Cloud --variant Container \`
		`--variant Labs --variant Spins --variant Workstation --variant Modular \`
		`--link-dest="$RSYNCTARGET/Everything/" --delete-after`
		`- # aarch64 is alternative for AtomicHost Cloud Labs Spins Workstation`
		`+ # aarch64 is alternative for AtomicHost Labs Spins Workstation`
		`$RSYNCPREFIX compose-partial-copy --arch=aarch64 \`
		`"$DESTDIR" "$RSYNCSECTARGET/" \`
		`- --variant AtomicHost --variant Cloud --variant Labs --variant Spins --variant Workstation \`
		`+ --variant AtomicHost --variant Labs --variant Spins --variant Workstation \`
		`--link-dest="$RSYNCTARGET/Everything/" --exclude=repodata`
		`$RSYNCPREFIX compose-partial-copy --arch=aarch64 \`
		`"$DESTDIR" "$RSYNCSECTARGET/" \`
		`- --variant AtomicHost --variant Cloud --variant Labs --variant Spins --variant Workstation \`
		`+ --variant AtomicHost --variant Labs --variant Spins --variant Workstation \`
		`--link-dest="$RSYNCTARGET/Everything/" --delete-after`
		`$RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"`
		`$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"`

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>`