davidlt/pungi-fedora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the pungi config for the UEFI on ARMv7 changes

Browse Source 
This update adds the various pieces for the UEFI side of things
and removes the old appliance build process including a few cleanups.

It also updates the sync process and cleans up a few bits here
while at it.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
This commit is contained in:
Peter Robinson 2021-02-18 19:18:28 +00:00 committed by mohanboddu
parent 39ed9bcc5c
commit 57985b087e
2 changed files with 51 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
fedora.conf
View File

@ -435,6 +435,20 @@ image_build = {
'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
}
},
{
'image-build': {
'format': [('raw-xz','raw.xz')],
'name': 'Fedora-Python-Classroom',
'kickstart': 'fedora-disk-python-classroom.ks',
'distro': 'Fedora-30',
'disk_size': 6,
'arches': ['aarch64', 'armhfp'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Python_Classroom',
'failable': ['*'],
}
},
],
'^Spins': [
{
@ -442,9 +456,9 @@ image_build = {
'format': [('raw-xz','raw.xz')],
'name': 'Fedora-Minimal',
'kickstart': 'fedora-disk-minimal.ks',
'distro': 'Fedora-22',
'distro': 'Fedora-30',
'disk_size': 6,
'arches': ['armhfp', 'aarch64'],
'arches': ['aarch64', 'armhfp'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Minimal',
@ -456,23 +470,37 @@ image_build = {
'format': [('raw-xz','raw.xz')],
'name': 'Fedora-KDE',
'kickstart': 'fedora-disk-kde.ks',
'distro': 'Fedora-22',
'distro': 'Fedora-30',
'disk_size': 11,
'arches': ['armhfp', 'aarch64'],
'arches': ['aarch64', 'armhfp'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'KDE',
'failable': ['*'],
}
},
{
'image-build': {
'format': [('raw-xz','raw.xz')],
'name': 'Fedora-SoaS',
'kickstart': 'fedora-disk-soas.ks',
'distro': 'Fedora-30',
'disk_size': 6,
'arches': ['aarch64', 'armhfp'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'SoaS',
'failable': ['*'],
}
},
{
'image-build': {
'format': [('raw-xz','raw.xz')],
'name': 'Fedora-Xfce',
'kickstart': 'fedora-disk-xfce.ks',
'distro': 'Fedora-22',
'disk_size': 9,
'arches': ['aarch64'],
'distro': 'Fedora-30',
'disk_size': 11,
'arches': ['aarch64', 'armhfp'],
'repo': 'Everything',
'install_tree_from': 'Everything',
'subvariant': 'Xfce',
@ -486,7 +514,7 @@ image_build = {
'format': [('raw-xz','raw.xz')],
'name': 'Fedora-Workstation',
'kickstart': 'fedora-disk-workstation.ks',
'distro': 'Fedora-22',
'distro': 'Fedora-30',
'disk_size': 11,
'arches': ['armhfp', 'aarch64'],
'repo': 'Everything',
@ -502,7 +530,7 @@ image_build = {
'format': [('raw-xz','raw.xz')],
'name': 'Fedora-Server',
'kickstart': 'fedora-disk-server.ks',
'distro': 'Fedora-22',
'distro': 'Fedora-30',
'disk_size': 7,
'arches': ['armhfp', 'aarch64'],
'repo': 'Server',
@ -689,99 +717,6 @@ failable_deliverables = [
})
]
live_target = 'f35'
live_images_no_rename = True
# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
live_images = [
('^Workstation$', {
'armhfp': {
'kickstart': 'fedora-arm-workstation.ks',
'name': 'Fedora-Workstation-armhfp',
'repo': 'Everything',
'type': 'appliance',
'failable': True,
'subvariant': 'Workstation_Appliance',
}
}),
('^Server$', {
'armhfp': {
'kickstart': 'fedora-arm-server.ks',
'name': 'Fedora-Server-armhfp',
'type': 'appliance',
'failable': True,
'subvariant': 'Server_Appliance',
}
}),
('^Spins$', {
'armhfp': [{
'kickstart': 'fedora-arm-kde.ks',
'name': 'Fedora-KDE-armhfp',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'KDE_Appliance',
'failable': True,
},
{
'kickstart': 'fedora-arm-lxde.ks',
'name': 'Fedora-LXDE-armhfp',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'LXDE',
'failable': True,
},
{
'kickstart': 'fedora-arm-mate.ks',
'name': 'Fedora-Mate-armhfp',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'Mate',
'failable': True,
},
{
'kickstart': 'fedora-arm-minimal.ks',
'name': 'Fedora-Minimal-armhfp',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'Minimal_Appliance',
'failable': False,
},
{
'kickstart': 'fedora-arm-soas.ks',
'name': 'Fedora-SoaS-armhfp',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'SoaS',
'failable': True,
},
{
'kickstart': 'fedora-arm-xfce.ks',
'name': 'Fedora-Xfce-armhfp',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'Xfce_Appliance',
'failable': True,
},
{
'kickstart': 'fedora-arm-lxqt.ks',
'name': 'Fedora-LXQt-armhfp',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'LXQt',
'failable': True,
},]
}),
('^Labs$', {
'armhfp': {
'kickstart': 'fedora-arm-python-classroom.ks',
'name': 'Fedora-Python-Classroom-armhfp',
'repo': 'Everything',
'type': 'appliance',
'subvariant': 'Python_Classroom',
'failable': True,
}
}),
]
ostree = {
"^Silverblue$": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",

43
nightly.sh
View File

@ -121,27 +121,18 @@ send_fedora_message "${fedora_message_json_start}" ${RELEASE} rsync.start
if [ ! -d "$RSYNCTARGET" ]; then
mkdir "$RSYNCTARGET"
fi
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
# armhfp/aarch64/x86_64 for Everything Cloud Container Modular Server Workstation is primary
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=aarch64 --arch=x86_64 --arch src \
"$DESTDIR" "$RSYNCTARGET/" \
--variant Everything --variant Cloud --variant Container --variant Modular \
--variant Server --variant Spins --variant Silverblue --variant Workstation \
--link-dest="$RSYNCTARGET/Everything" --exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=aarch64 --arch=x86_64 --arch src \
"$DESTDIR" "$RSYNCTARGET/" \
--variant Everything --variant Cloud --variant Container \
--variant Server --variant Spins --variant Workstation --variant Silverblue --variant Modular \
--link-dest="$RSYNCTARGET/Everything" --exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
"$DESTDIR" "$RSYNCTARGET/" \
--variant Everything --variant Cloud --variant Container \
--variant Server --variant Spins --variant Workstation --variant Silverblue --variant Modular \
--link-dest="$RSYNCTARGET/Everything" --delete-after
# aarch64 for Everything Server Cloud Container Workstation is primary
$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
"$DESTDIR" "$RSYNCTARGET/" \
--variant Everything --variant Server --variant Cloud --variant Container \
--variant Modular --variant Workstation \
--link-dest="$RSYNCTARGET/Everything" --exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
"$DESTDIR" "$RSYNCTARGET/" \
--variant Everything --variant Server --variant Cloud --variant Container \
--variant Modular --variant Workstation \
--variant Modular --variant Server --variant Workstation \
--link-dest="$RSYNCTARGET/Everything" --delete-after
$RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"
@ -152,11 +143,12 @@ time hardlink -v "$RSYNCTARGET/.."
if [ ! -d "$RSYNCALTTARGET" ]; then
mkdir "$RSYNCALTTARGET"
fi
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
# labs artefacts are alternative
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=aarch64 --arch=x86_64 \
"$DESTDIR" "$RSYNCALTTARGET/" \
--variant Labs \
--link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=aarch64 --arch=x86_64 \
"$DESTDIR" "$RSYNCALTTARGET/" \
--variant Labs \
--link-dest="$RSYNCTARGET/Everything/" --delete-after
@ -170,6 +162,7 @@ time hardlink -v "$RSYNCTARGET/.."
if [ ! -d "$RSYNCSECTARGET" ]; then
mkdir "$RSYNCSECTARGET"
fi
# all ppc64le/s390x artefacts are secondary
$RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
"$DESTDIR" "$RSYNCSECTARGET/" \
--variant Everything --variant Cloud --variant Container \
@ -180,15 +173,7 @@ $RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
--variant Everything --variant Cloud --variant Container \
--variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \
--link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --delete-after
# aarch64 is alternative for Labs Spins
$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
"$DESTDIR" "$RSYNCSECTARGET/" \
--variant Labs --variant Spins \
--link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
"$DESTDIR" "$RSYNCSECTARGET/" \
--variant Labs --variant Spins \
--link-dest="$RSYNCTARGET/Everything/" --delete-after
$RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"