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

Merge #517 Updates for aarch64 server promotion

Browse Source
This commit is contained in:
Dennis Gilmore 2018-02-19 15:16:16 +00:00
commit edd61ce65b
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fedora.conf
View File

@ -294,8 +294,8 @@ image_build = {
'factory-parameters': {
'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}',
},
},
{
@ -314,8 +314,8 @@ image_build = {
'factory-parameters': {
'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "27"}',
'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}',
},
}
],
@ -331,7 +331,7 @@ image_build = {
'repo': 'Cloud',
'install_tree_from': 'Cloud',
'subvariant': 'Cloud_Base',
'failable': ['aarch64', 'ppc64', 'ppc64le'],
'failable': ['ppc64', 'ppc64le'],
}
},
{
@ -608,8 +608,7 @@ failable_deliverables = [
('^.*$', {
# Buildinstall is non blocking
'src': ['buildinstall'],
# Nothing on aarch64, i386, ppc64, ppc64le blocks the compose
'aarch64': ['buildinstall', 'iso'],
# Nothing on i386, ppc64, ppc64le blocks the compose
'i386': ['buildinstall', 'iso'],
'ppc64': ['buildinstall', 'iso'],
'ppc64le': ['buildinstall', 'iso'],

26
nightly.sh
View File

@ -126,11 +126,11 @@ $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
# aarch64 for Server and Everything is primary
$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
"$DESTDIR" "$RSYNCTARGET/" \
--variant Everything --variant Server \
--variant Everything --variant Server --variant CloudImages --variant Docker \
--link-dest="$RSYNCTARGET/Everything" --exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
"$DESTDIR" "$RSYNCTARGET/" \
--variant Everything --variant Server --variant \
--variant Everything --variant Server --variant CloudImages --variant Docker \
--link-dest="$RSYNCTARGET/Everything" --delete-after
$RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"
@ -160,7 +160,7 @@ $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch
$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
"$DESTDIR" "$RSYNCSECTARGET/" \
--link-dest="$RSYNCTARGET/Everything/" --delete-after
# aarch64 is alternative for Atomic Cloud CloudImages Container Labs Spins Workstation
# aarch64 is alternative for Atomic Labs Spins Workstation
$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
"$DESTDIR" "$RSYNCSECTARGET/" \
--variant Atomic --variant Cloud --variant CloudImages --variant Docker --variant Labs --variant Spins --variant Workstation \
@ -169,6 +169,14 @@ $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch
"$DESTDIR" "$RSYNCSECTARGET/" \
--variant Atomic --variant Cloud --variant CloudImages --variant Docker --variant Labs --variant Spins --variant Workstation \
--link-dest="$RSYNCTARGET/Everything/" --delete-after
$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
"$DESTDIR" "$RSYNCSECTARGET/" \
--variant Atomic --variant Cloud --variant Labs --variant Spins --variant Workstation \
--link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
"$DESTDIR" "$RSYNCSECTARGET/" \
--variant Atomic --variant Cloud --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"
@ -187,17 +195,5 @@ for tomail in $TOMAIL ; do
mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
done
for koji in arm ppc s390
do
if [ "$koji" = "arm" ]; then
arches=aarch64
elif [ "$koji" = "ppc" ]; then
arches=ppc64,ppc64le
elif [ "$koji" = "s390" ]; then
arches=s390x
fi
./releng/scripts/srpm-excluded-arch.py -a $arches --path $DESTDIR/compose/Everything/source/tree/Packages/ >$DESTDIR/logs/excludearch-$koji.log
done
find $TARGET_DIR -xdev -depth -maxdepth 2 -mtime +14 -exec rm -rf {} \;