From 3c955c14a8904f9a8eb16aab1577b8ae418fdb29 Mon Sep 17 00:00:00 2001 From: sharpenedblade Date: Tue, 16 Jan 2024 23:31:28 -0800 Subject: [PATCH] Remove cloud, container, and vagrant builds --- .fmf/version | 1 - .zuul.yaml | 26 --- VARIANTS.md | 4 - components/users.xml | 2 +- config.sh | 146 ++--------------- config.xml | 3 - maintainers.toml | 131 --------------- platforms/cloud.xml | 107 ------------- platforms/container.xml | 149 ------------------ platforms/vagrant.xml | 64 -------- tmt/plans/cloud/base/build-aws.fmf | 8 - tmt/plans/cloud/base/build-azure.fmf | 8 - tmt/plans/cloud/base/build-gcp.fmf | 8 - tmt/plans/cloud/base/build-generic.fmf | 8 - .../container/base/build-generic-minimal.fmf | 8 - tmt/plans/container/base/build-generic.fmf | 8 - tmt/plans/container/toolbox/build-toolbox.fmf | 8 - tmt/plans/vagrant/base/build-libvirt.fmf | 8 - tmt/plans/vagrant/base/build-virtualbox.fmf | 11 -- tmt/tests/build-image.fmf | 12 -- 20 files changed, 15 insertions(+), 705 deletions(-) delete mode 100644 .fmf/version delete mode 100644 .zuul.yaml delete mode 100644 maintainers.toml delete mode 100644 platforms/cloud.xml delete mode 100644 platforms/container.xml delete mode 100644 platforms/vagrant.xml delete mode 100644 tmt/plans/cloud/base/build-aws.fmf delete mode 100644 tmt/plans/cloud/base/build-azure.fmf delete mode 100644 tmt/plans/cloud/base/build-gcp.fmf delete mode 100644 tmt/plans/cloud/base/build-generic.fmf delete mode 100644 tmt/plans/container/base/build-generic-minimal.fmf delete mode 100644 tmt/plans/container/base/build-generic.fmf delete mode 100644 tmt/plans/container/toolbox/build-toolbox.fmf delete mode 100644 tmt/plans/vagrant/base/build-libvirt.fmf delete mode 100644 tmt/plans/vagrant/base/build-virtualbox.fmf delete mode 100644 tmt/tests/build-image.fmf diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.zuul.yaml b/.zuul.yaml deleted file mode 100644 index 1a0971b..0000000 --- a/.zuul.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- job: - name: build-images-x86_64 - parent: tmt-test - vars: - tmt_url: "https://pagure.io/{{ zuul.project.name }}" - tmt_ref: "{{ zuul.ref }}" - distro: fedora-rawhide - compose: Fedora-latest - tf_arch: x86_64 - -- job: - name: build-images-aarch64 - parent: tmt-test - vars: - tmt_url: "https://pagure.io/{{ zuul.project.name }}" - tmt_ref: "{{ zuul.ref }}" - distro: fedora-rawhide - compose: Fedora-latest - tf_arch: aarch64 - -- project: - check: - jobs: - - build-images-x86_64 - - build-images-aarch64 diff --git a/VARIANTS.md b/VARIANTS.md index 95c6f8f..a0b66d1 100644 --- a/VARIANTS.md +++ b/VARIANTS.md @@ -1,9 +1,5 @@ ## Image variants -* Base Cloud Edition for clouds (image type: `oem`, image profiles: `Cloud-Base-Generic`/`Cloud-Base-AmazonEC2`/`Cloud-Base-Azure`/`Cloud-Base-GCE`) -* Base Cloud Edition for Vagrant (image type: `oem`, image profiles: `Cloud-Base-Vagrant-libvirt`/`Cloud-Base-Vagrant-VirtualBox`) -* Base Container (image type: `tbz`, image profiles `Container-Base-Generic-Minimal`/`Container-Base-Generic`) -* Toolbox Container (image type: `tbz`, image profiles `Container-Toolbox`) * KDE Spin (image type: `iso`, image profiles: `KDE-Live`) * Workstation Edition (image type: `iso`, image profiles: `Workstation-Live`) diff --git a/components/users.xml b/components/users.xml index 08b91a1..9824054 100644 --- a/components/users.xml +++ b/components/users.xml @@ -1,5 +1,5 @@ - + diff --git a/config.sh b/config.sh index f2203e2..5a7be5b 100755 --- a/config.sh +++ b/config.sh @@ -16,10 +16,8 @@ echo "Configure image: [$kiwi_iname]-[$kiwi_profiles]..." #====================================== # Set SELinux booleans #-------------------------------------- -if [[ "$kiwi_profiles" != *"Container"* ]]; then - ## Fixes KDE Plasma, see rhbz#2058657 - setsebool -P selinuxuser_execmod 1 -fi +## Fixes KDE Plasma, see rhbz#2058657 +setsebool -P selinuxuser_execmod 1 #====================================== # Clear machine specific configuration @@ -33,20 +31,18 @@ rm -f /var/lib/systemd/random-seed #====================================== # Configure grub correctly #-------------------------------------- -if [[ "$kiwi_profiles" != *"Container"* ]]; then - ## Works around issues with grub-bls - ## See: https://github.com/OSInside/kiwi/issues/2198 - echo "GRUB_DEFAULT=saved" >> /etc/default/grub - ## Disable submenus to match Fedora - echo "GRUB_DISABLE_SUBMENU=true" >> /etc/default/grub - ## Disable recovery entries to match Fedora - echo "GRUB_DISABLE_RECOVERY=true" >> /etc/default/grub -fi +## Works around issues with grub-bls +## See: https://github.com/OSInside/kiwi/issues/2198 +echo "GRUB_DEFAULT=saved" >> /etc/default/grub +## Disable submenus to match Fedora +echo "GRUB_DISABLE_SUBMENU=true" >> /etc/default/grub +## Disable recovery entries to match Fedora +echo "GRUB_DISABLE_RECOVERY=true" >> /etc/default/grub #====================================== # Delete & lock the root user password #-------------------------------------- -if [[ "$kiwi_profiles" == *"Cloud"* ]] || [[ "$kiwi_profiles" == *"Live"* ]]; then +if [[ "$kiwi_profiles" == *"Live"* ]]; then passwd -d root passwd -l root fi @@ -95,130 +91,16 @@ fi #====================================== # Setup default target #-------------------------------------- -if [[ "$kiwi_profiles" != *"Container"* ]]; then - if [[ "$kiwi_profiles" == *"Desktop"* ]]; then - systemctl set-default graphical.target - else - systemctl set-default multi-user.target - fi +if [[ "$kiwi_profiles" == *"Desktop"* ]]; then + systemctl set-default graphical.target +else + systemctl set-default multi-user.target fi #====================================== # Setup default customizations #-------------------------------------- -if [[ "$kiwi_profiles" == *"Azure"* ]]; then -cat > /etc/ssh/sshd_config.d/50-client-alive-interval.conf << EOF -ClientAliveInterval 120 -EOF - -cat >> /etc/chrony.conf << EOF -# Azure's virtual time source: -# https://docs.microsoft.com/en-us/azure/virtual-machines/linux/time-sync#check-for-ptp-clock-source -refclock PHC /dev/ptp_hyperv poll 3 dpoll -2 offset 0 -EOF -fi - -if [[ "$kiwi_profiles" == *"GCE"* ]]; then -cat < /etc/NetworkManager/conf.d/gcp-mtu.conf -# In GCP it is recommended to use 1460 as the MTU. -# Set it to 1460 for all connections. -# https://cloud.google.com/network-connectivity/docs/vpn/concepts/mtu-considerations -[connection] -ethernet.mtu = 1460 -EOF -fi - -if [[ "$kiwi_profiles" == *"Vagrant"* ]]; then -sed -e 's/.*UseDNS.*/UseDNS no/' -i /etc/ssh/sshd_config -mkdir -m 0700 -p ~vagrant/.ssh -cat > ~vagrant/.ssh/authorized_keys << EOKEYS -ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key -EOKEYS -chmod 600 ~vagrant/.ssh/authorized_keys -chown -R vagrant:vagrant ~vagrant/.ssh/ - -cat > /etc/ssh/sshd_config.d/10-vagrant-insecure-rsa-key.conf < /etc/rpm/macros.image-language-conf - - # https://bugzilla.redhat.com/show_bug.cgi?id=1727489 - echo 'LANG="C.UTF-8"' > /etc/locale.conf - - # https://bugzilla.redhat.com/show_bug.cgi?id=1400682 - echo "Import RPM GPG key" - releasever=$(rpm --eval '%{?fedora}') - - # When building ELN containers, we don't have the %{fedora} macro - if [ -z $releasever ]; then - releasever=eln - fi - - rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary - - echo "# fstab intentionally empty for containers" > /etc/fstab - - # Remove machine-id on pre generated images - rm -f /etc/machine-id - touch /etc/machine-id - - echo "# resolv placeholder" > /etc/resolv.conf - chmod 644 /etc/resolv.conf - - # Remove extraneous files - rm -rf /tmp/* - - # https://pagure.io/atomic-wg/issue/308 - printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf - - if [[ "$kiwi_profiles" == *"Base-Generic-Minimal"* ]]; then - # remove some random help txt files - rm -fv /usr/share/gnupg/help*.txt - - # Pruning random things - rm /usr/lib/rpm/rpm.daily - rm -rfv /usr/lib64/nss/unsupported-tools/ # unsupported - - # Statically linked crap - rm -fv /usr/sbin/{glibc_post_upgrade.x86_64,sln} - ln /usr/bin/ln usr/sbin/sln - - # Remove some dnf info - rm -rfv /var/lib/dnf - - # don't need icons - rm -rfv /usr/share/icons/* - - #some random not-that-useful binaries - rm -fv /usr/bin/pinky - - # we lose presets by removing /usr/lib/systemd but we do not care - rm -rfv /usr/lib/systemd - fi - if [[ "$kiwi_profiles" == *"Toolbox"* ]]; then - # Remove macros.image-language-conf file - rm -f /etc/rpm/macros.image-language-conf - - # Remove 'tsflags=nodocs' line from dnf.conf - sed -i '/tsflags=nodocs/d' /etc/dnf/dnf.conf - fi -fi - if [[ "$kiwi_profiles" == *"SoaS"* ]]; then # Get proper release naming in the control panel cat >> /boot/olpc_build << EOF diff --git a/config.xml b/config.xml index f22284c..4db1d0d 100644 --- a/config.xml +++ b/config.xml @@ -21,9 +21,6 @@ - - - diff --git a/maintainers.toml b/maintainers.toml deleted file mode 100644 index 5a785f3..0000000 --- a/maintainers.toml +++ /dev/null @@ -1,131 +0,0 @@ -[spins.lxqt.x86_64] -fas = [ "lupinix", "zsun" ] -maintainers = [ "Christian Dersch", "Zamir SUN" ] -[spins.lxqt.armhfp] -fas = [ "lupinix", "zsun" ] -maintainers = [ "Christian Dersch", "Zamir SUN" ] - -[spins.xfce.x86_64] -fas = [ "nonamedotc", "kevin", "maxamillion" ] -maintainers = [ "Mukundan Ragavan", "Kevin Fenzi", "Adam Miller" ] -[spins.xfce.armhfp] -fas = [ "nonamedotc", "kevin", "maxamillion" ] -maintainers = [ "Mukundan Ragavan", "Kevin Fenzi", "Adam Miller" ] - -[spins.kde.x86_64] -fas = [ "rdieter", "marcdeop", "ngompa" ] -maintainers = [ "Rex Dieter", "Marc Deop", "Neal Gompa" ] - -[spins.cinnamon.x86_64] -fas = [ "grinnz" ] -maintainers = [ "Dan Book" ] - -[spins.lxde.x86_64] -fas = [ "cwickert", "mtasaka" ] -maintainers = [ "Christoph Wickert", "Mamoru TASAKA" ] -[spins.lxde.armhfp] -fas = [ "cwickert", "mtasaka" ] -maintainers = [ "Christoph Wickert", "Mamoru TASAKA" ] - -[spins.soas.x86_64] -fas = [ "chimosky", "aperezbios" ] -maintainers = [ "Chihurumnaya Ibiam", "Alex Perez" ] -[spins.soas.armhfp] -fas = [ "chimosky", "aperezbios", ] -maintainers = [ "Chihurumnaya Ibiam", "Alex Perez" ] - -[labs.astronomy_kde.x86_64] -fas = [ "lupinix" ] -maintainers = [ "Christian Dersch" ] - -[labs.security.x86_64] -fas = [ "fab", "jsimon", "q5sys"] -maintainers = [ "Fabian Affolter", "Joerg Simon", "JT Pennington" ] - -[labs.comp_neuro.x86_64] -fas = [ "bt0dotninja", "dan1mal", "ankursinha", "neuro-sig" ] -maintainers = [ "Alberto Rodriguez Sanchez", "Danny Lee", "Ankur Sinha", "NeuroFedora SIG" ] - -[labs.design_suite.x86_64] -fas = [ "luya" ] -maintainers = [ "Luya Tshimbalanga" ] - -[labs.games.x86_64] -fas = [ "dagostinelli", "richardanaya" ] -maintainers = [ "Darryl T. Agostinelli", "Richard Anaya" ] - -[labs.jam_kde.x86_64] -fas = [ "q5sys" ] -maintainers = [ "JT Pennington" ] - -[labs.python_classroom.x86_64] -fas = [ "churchyard", "python-sig" ] -maintainers = [ "Miro Hrončok", "Python SIG" ] - -[labs.scientific_kde.x86_64] -fas = [ "scitech" ] -maintainers = [ "SciTech SIG" ] - -[labs.scientific.x86_64] -fas = [ "scitech" ] -maintainers = [ "SciTech SIG" ] - -[labs.robotics.x86_64] -fas = [ "x3mboy", "robotics-sig" ] -maintainers = [ "Eduard Lucena", "Robotics SIG" ] - -[spins.i3.x86_64] -fas = [ "jflory7", "defolos", "nasirhm", "odilhao", "x3mboy" ] -maintainers = [ "Justin Flory", "Dan Čermák", "Nasir Hussain", "Odilon Junior", "Eduard Lucena" ] - -[eln] -fas = [ "sgallagh", "tdawson", "asamalik" ] -maintainers = [ "Stephen Gallagher", "Troy Dawson", "Adam Samalik" ] - -[spins.budgie.x86_64] -fas = [ "joshstrobl" ] -maintainers = [ "Joshua Strobl" ] - -[spins.sway.x86_64] -fas = [ "alebastr", "jkonecny", "anthr76", "fale" ] -maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ] - -[silverblue.x86_64] -fas = [ "siosm", "tpopela" ] -maintainers = [ "Timothée Ravier", "Tomáš Popela" ] -[silverblue.aarch64] -fas = [ "siosm", "tpopela" ] -maintainers = [ "Timothée Ravier", "Tomáš Popela" ] -[silverblue.ppc64le] -fas = [ "siosm", "tpopela" ] -maintainers = [ "Timothée Ravier", "Tomáš Popela" ] - -[kinoite.x86_64] -fas = [ "siosm" ] -maintainers = [ "Timothée Ravier" ] -[kinoite.aarch64] -fas = [ "siosm" ] -maintainers = [ "Timothée Ravier" ] -[kinoite.ppc64le] -fas = [ "siosm" ] -maintainers = [ "Timothée Ravier" ] - -[sericea.x86_64] -fas = [ "alebastr", "jkonecny", "anthr76", "fale" ] -maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ] -[sericea.aarch64] -fas = [ "alebastr", "jkonecny", "anthr76", "fale" ] -maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ] -[sericea.ppc64le] -fas = [ "alebastr", "jkonecny", "anthr76", "fale" ] -maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ] - -[onyx.x86_64] -fas = [ "joshstrobl" ] -maintainers = [ "Joshua Strobl" ] -[onyx.aarch64] -fas = [ "joshstrobl" ] -maintainers = [ "Joshua Strobl" ] -[onyx.ppc64le] -fas = [ "joshstrobl" ] -maintainers = [ "Joshua Strobl" ] diff --git a/platforms/cloud.xml b/platforms/cloud.xml deleted file mode 100644 index 2d5e28c..0000000 --- a/platforms/cloud.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - - false - - - - - - - 5 - - - - - - - false - - - - - - - 5 - - - - - - - false - - - - - - - 5 - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/platforms/container.xml b/platforms/container.xml deleted file mode 100644 index 2291a51..0000000 --- a/platforms/container.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - - - - - - - - - - Etc/UTC - en_US - true - true - - - - Etc/UTC - en_US - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/platforms/vagrant.xml b/platforms/vagrant.xml deleted file mode 100644 index 9c784ff..0000000 --- a/platforms/vagrant.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - 5 - - - - - - - - false - - - - - - - 5 - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tmt/plans/cloud/base/build-aws.fmf b/tmt/plans/cloud/base/build-aws.fmf deleted file mode 100644 index f2d2fe4..0000000 --- a/tmt/plans/cloud/base/build-aws.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build AWS EC2 base image -discover: - how: fmf -environment: - image_type: oem - image_profile: Cloud-Base-AmazonEC2 -execute: - how: tmt diff --git a/tmt/plans/cloud/base/build-azure.fmf b/tmt/plans/cloud/base/build-azure.fmf deleted file mode 100644 index 970ee9a..0000000 --- a/tmt/plans/cloud/base/build-azure.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build Azure base image -discover: - how: fmf -environment: - image_type: oem - image_profile: Cloud-Base-Azure -execute: - how: tmt diff --git a/tmt/plans/cloud/base/build-gcp.fmf b/tmt/plans/cloud/base/build-gcp.fmf deleted file mode 100644 index abe823c..0000000 --- a/tmt/plans/cloud/base/build-gcp.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build GCP base image -discover: - how: fmf -environment: - image_type: oem - image_profile: Cloud-Base-GCE -execute: - how: tmt diff --git a/tmt/plans/cloud/base/build-generic.fmf b/tmt/plans/cloud/base/build-generic.fmf deleted file mode 100644 index 752bf11..0000000 --- a/tmt/plans/cloud/base/build-generic.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build Generic base image -discover: - how: fmf -environment: - image_type: oem - image_profile: Cloud-Base-Generic -execute: - how: tmt diff --git a/tmt/plans/container/base/build-generic-minimal.fmf b/tmt/plans/container/base/build-generic-minimal.fmf deleted file mode 100644 index 803cd01..0000000 --- a/tmt/plans/container/base/build-generic-minimal.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build Minimal Generic base container image -discover: - how: fmf -environment: - image_type: tbz - image_profile: Container-Base-Generic-Minimal -execute: - how: tmt diff --git a/tmt/plans/container/base/build-generic.fmf b/tmt/plans/container/base/build-generic.fmf deleted file mode 100644 index 83e6100..0000000 --- a/tmt/plans/container/base/build-generic.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build Generic base container image -discover: - how: fmf -environment: - image_type: tbz - image_profile: Container-Base-Generic -execute: - how: tmt diff --git a/tmt/plans/container/toolbox/build-toolbox.fmf b/tmt/plans/container/toolbox/build-toolbox.fmf deleted file mode 100644 index 40692c3..0000000 --- a/tmt/plans/container/toolbox/build-toolbox.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build Toolbox container image -discover: - how: fmf -environment: - image_type: tbz - image_profile: Container-Toolbox -execute: - how: tmt diff --git a/tmt/plans/vagrant/base/build-libvirt.fmf b/tmt/plans/vagrant/base/build-libvirt.fmf deleted file mode 100644 index 8c49c19..0000000 --- a/tmt/plans/vagrant/base/build-libvirt.fmf +++ /dev/null @@ -1,8 +0,0 @@ -summary: Build base Vagrant image for libvirt -discover: - how: fmf -environment: - image_type: oem - image_profile: Cloud-Base-Vagrant-libvirt -execute: - how: tmt diff --git a/tmt/plans/vagrant/base/build-virtualbox.fmf b/tmt/plans/vagrant/base/build-virtualbox.fmf deleted file mode 100644 index 9fcd97e..0000000 --- a/tmt/plans/vagrant/base/build-virtualbox.fmf +++ /dev/null @@ -1,11 +0,0 @@ -summary: Build base Vagrant image for VirtualBox -discover: - how: fmf -adjust: - enabled: false - when: arch != x86_64 -environment: - image_type: oem - image_profile: Cloud-Base-Vagrant-VirtualBox -execute: - how: tmt diff --git a/tmt/tests/build-image.fmf b/tmt/tests/build-image.fmf deleted file mode 100644 index 8100c9c..0000000 --- a/tmt/tests/build-image.fmf +++ /dev/null @@ -1,12 +0,0 @@ -summary: Build image -require: - - distribution-gpg-keys - - git-core - - kiwi - - libselinux-utils -framework: shell -path: / -test: | - ./kiwi-build --debug --image-type="$image_type" --image-profile="$image_profile" --kiwi-description-dir="${TMT_TREE}" --output-dir="${TMT_TEST_DATA}" - rm -rf "${TMT_TEST_DATA}/build/image-root" -duration: 60m