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

Drop i386 images and things that need a kernel, leave modular and Everything trees.

Browse Source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2019-07-12 09:24:15 -07:00
parent 740dae96b0
commit 8ba80a5e10
3 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fedora.conf
View File

@ -392,7 +392,7 @@ image_build = {
'kickstart': 'fedora-python-classroom-vagrant.ks', 'kickstart': 'fedora-python-classroom-vagrant.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 40, 'disk_size': 40,
'arches': ['x86_64','i386'], 'arches': ['x86_64'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Python_Classroom', 'subvariant': 'Python_Classroom',
@ -409,7 +409,7 @@ image_build = {
'kickstart': 'fedora-scientific-vagrant.ks', 'kickstart': 'fedora-scientific-vagrant.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 40, 'disk_size': 40,
'arches': ['x86_64','i386'], 'arches': ['x86_64'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Scientific', 'subvariant': 'Scientific',
@ -475,8 +475,7 @@ live_media = {
{ {
'name': 'Fedora-Workstation-Live', 'name': 'Fedora-Workstation-Live',
'kickstart': 'fedora-live-workstation.ks', 'kickstart': 'fedora-live-workstation.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64', ],
'failable': ['i386'],
'repo': 'Everything', 'repo': 'Everything',
'subvariant': 'Workstation' 'subvariant': 'Workstation'
@ -486,8 +485,7 @@ live_media = {
{ {
'name': 'Fedora-KDE-Live', 'name': 'Fedora-KDE-Live',
'kickstart': 'fedora-live-kde.ks', 'kickstart': 'fedora-live-kde.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64'],
'failable': ['i386'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'KDE' 'subvariant': 'KDE'
@ -496,7 +494,7 @@ live_media = {
{ {
'name': 'Fedora-Xfce-Live', 'name': 'Fedora-Xfce-Live',
'kickstart': 'fedora-live-xfce.ks', 'kickstart': 'fedora-live-xfce.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64'],
'failable': ['*'], 'failable': ['*'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
@ -505,7 +503,7 @@ live_media = {
{ {
'name': 'Fedora-SoaS-Live', 'name': 'Fedora-SoaS-Live',
'kickstart': 'fedora-live-soas.ks', 'kickstart': 'fedora-live-soas.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64'],
'failable': ['*'], 'failable': ['*'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
@ -514,7 +512,7 @@ live_media = {
{ {
'name': 'Fedora-Cinnamon-Live', 'name': 'Fedora-Cinnamon-Live',
'kickstart': 'fedora-live-cinnamon.ks', 'kickstart': 'fedora-live-cinnamon.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64'],
'failable': ['*'], 'failable': ['*'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
@ -523,7 +521,7 @@ live_media = {
{ {
'name': 'Fedora-LXDE-Live', 'name': 'Fedora-LXDE-Live',
'kickstart': 'fedora-live-lxde.ks', 'kickstart': 'fedora-live-lxde.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64'],
'failable': ['*'], 'failable': ['*'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
@ -532,7 +530,7 @@ live_media = {
{ {
'name': 'Fedora-MATE_Compiz-Live', 'name': 'Fedora-MATE_Compiz-Live',
'kickstart': 'fedora-live-mate_compiz.ks', 'kickstart': 'fedora-live-mate_compiz.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64'],
'failable': ['*'], 'failable': ['*'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
@ -541,7 +539,7 @@ live_media = {
{ {
'name': 'Fedora-LXQt-Live', 'name': 'Fedora-LXQt-Live',
'kickstart': 'fedora-live-lxqt.ks', 'kickstart': 'fedora-live-lxqt.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64'],
'failable': ['*'], 'failable': ['*'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
@ -552,7 +550,7 @@ live_media = {
{ {
'name': 'Fedora-Astronomy_KDE-Live', 'name': 'Fedora-Astronomy_KDE-Live',
'kickstart': 'fedora-live-astronomy_kde.ks', 'kickstart': 'fedora-live-astronomy_kde.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64'],
'failable': ['*'], 'failable': ['*'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
@ -561,7 +559,7 @@ live_media = {
{ {
'name': 'Fedora-Design_suite-Live', 'name': 'Fedora-Design_suite-Live',
'kickstart': 'fedora-live-design_suite.ks', 'kickstart': 'fedora-live-design_suite.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64'],
'failable': ['*'], 'failable': ['*'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
@ -570,7 +568,7 @@ live_media = {
{ {
'name': 'Fedora-Scientific_KDE-Live', 'name': 'Fedora-Scientific_KDE-Live',
'kickstart': 'fedora-live-scientific_kde.ks', 'kickstart': 'fedora-live-scientific_kde.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64'],
'failable': ['*'], 'failable': ['*'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
@ -579,7 +577,7 @@ live_media = {
{ {
'name': 'Fedora-Games-Live', 'name': 'Fedora-Games-Live',
'kickstart': 'fedora-live-games.ks', 'kickstart': 'fedora-live-games.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64'],
'failable': ['*'], 'failable': ['*'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
@ -588,7 +586,7 @@ live_media = {
{ {
'name': 'Fedora-Security-Live', 'name': 'Fedora-Security-Live',
'kickstart': 'fedora-live-security.ks', 'kickstart': 'fedora-live-security.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64'],
'failable': ['*'], 'failable': ['*'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
@ -597,7 +595,7 @@ live_media = {
{ {
'name': 'Fedora-Jam_KDE-Live', 'name': 'Fedora-Jam_KDE-Live',
'kickstart': 'fedora-live-jam_kde.ks', 'kickstart': 'fedora-live-jam_kde.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64'],
'failable': ['*'], 'failable': ['*'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
@ -606,7 +604,7 @@ live_media = {
{ {
'name': 'Fedora-Robotics-Live', 'name': 'Fedora-Robotics-Live',
'kickstart': 'fedora-live-robotics.ks', 'kickstart': 'fedora-live-robotics.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64'],
'failable': ['*'], 'failable': ['*'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
@ -615,7 +613,7 @@ live_media = {
{ {
'name': 'Fedora-Python-Classroom-Live', 'name': 'Fedora-Python-Classroom-Live',
'kickstart': 'fedora-live-python-classroom.ks', 'kickstart': 'fedora-live-python-classroom.ks',
'arches': ['x86_64', 'i386'], 'arches': ['x86_64'],
'failable': ['*'], 'failable': ['*'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',

2
nightly.sh
View File

@ -108,7 +108,7 @@ else
TREENAME="F-$RELEASE" TREENAME="F-$RELEASE"
fi fi
# disable sending email for now until we are sure we wont generating mass emails # disable sending email for now until we are sure we wont generating mass emails
./releng/scripts/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/" --only-arches i386 ppc64le s390x x86_64> "$DESTDIR/logs/depcheck" ./releng/scripts/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/" --only-arches ppc64le s390x x86_64> "$DESTDIR/logs/depcheck"
[ -z "$ARCH" ] && { [ -z "$ARCH" ] && {
./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log ./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log

5
variants-fedora.xml
View File

@ -31,7 +31,6 @@
<variant id="Labs" name="Labs" type="variant" is_empty="true"> <variant id="Labs" name="Labs" type="variant" is_empty="true">
<arches> <arches>
<arch>armhfp</arch> <arch>armhfp</arch>
<arch>i386</arch>
<arch>x86_64</arch> <arch>x86_64</arch>
</arches> </arches>
</variant> </variant>
@ -39,7 +38,6 @@
<arches> <arches>
<arch>armhfp</arch> <arch>armhfp</arch>
<arch>aarch64</arch> <arch>aarch64</arch>
<arch>i386</arch>
<arch>ppc64le</arch> <arch>ppc64le</arch>
<arch>s390x</arch> <arch>s390x</arch>
<arch>x86_64</arch> <arch>x86_64</arch>
@ -78,7 +76,6 @@
<arches> <arches>
<arch>aarch64</arch> <arch>aarch64</arch>
<arch>armhfp</arch> <arch>armhfp</arch>
<arch>i386</arch>
<arch>x86_64</arch> <arch>x86_64</arch>
</arches> </arches>
</variant> </variant>
@ -86,7 +83,6 @@
<arches> <arches>
<arch>aarch64</arch> <arch>aarch64</arch>
<arch>armhfp</arch> <arch>armhfp</arch>
<arch>i386</arch>
<arch>x86_64</arch> <arch>x86_64</arch>
</arches> </arches>
<groups> <groups>
@ -118,7 +114,6 @@
<arches> <arches>
<arch>aarch64</arch> <arch>aarch64</arch>
<arch>armhfp</arch> <arch>armhfp</arch>
<arch>i386</arch>
<arch>x86_64</arch> <arch>x86_64</arch>
<arch>ppc64le</arch> <arch>ppc64le</arch>
</arches> </arches>