From c839e0fc245dd660f745c0431afc601875002ace Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Tue, 26 Mar 2024 10:59:45 +0100 Subject: [PATCH] Move (almost) all C8S jobs to C9S So we won't get caught off guard when C8S is EOLed at the end of May. --- jenkins/runners/upstream-coverage.sh | 2 +- jenkins/runners/upstream-cron-build.sh | 4 ++-- .../upstream-vagrant-archlinux-sanitizers-stable.sh | 4 ++-- .../runners/upstream-vagrant-archlinux-sanitizers.sh | 4 ++-- jenkins/runners/upstream-vagrant-archlinux-stable.sh | 2 +- jenkins/runners/upstream-vagrant-archlinux.sh | 2 +- jenkins/runners/upstream-vagrant-rawhide-selinux.sh | 2 +- jenkins/runners/vagrant-make-cache.sh | 10 +++++----- vagrant/boxes/Vagrantfile_archlinux_systemd | 4 ++-- vagrant/boxes/Vagrantfile_rawhide_selinux | 4 ++-- vagrant/test_scripts/test-arch.sh | 1 + vagrant/vagrant-make-cache.sh | 4 ++-- vagrant/vagrant-setup.sh | 5 +---- vagrant/vagrantfiles/Vagrantfile_arch | 8 ++++---- vagrant/vagrantfiles/Vagrantfile_rawhide | 8 ++++---- 15 files changed, 31 insertions(+), 33 deletions(-) diff --git a/jenkins/runners/upstream-coverage.sh b/jenkins/runners/upstream-coverage.sh index 2b894c32..9427cde0 100644 --- a/jenkins/runners/upstream-coverage.sh +++ b/jenkins/runners/upstream-coverage.sh @@ -24,4 +24,4 @@ fi git clone https://github.com/systemd/systemd-centos-ci cd systemd-centos-ci -./agent-control.py --pool metal-ec2-c5n-centos-8s-x86_64 --vagrant arch-coverage ${ARGS:+"${ARGS[@]}"} +./agent-control.py --pool metal-ec2-c5n-centos-9s-x86_64 --vagrant arch-coverage ${ARGS:+"${ARGS[@]}"} diff --git a/jenkins/runners/upstream-cron-build.sh b/jenkins/runners/upstream-cron-build.sh index b887be15..3ce53f49 100644 --- a/jenkins/runners/upstream-cron-build.sh +++ b/jenkins/runners/upstream-cron-build.sh @@ -41,12 +41,12 @@ cd systemd-centos-ci run_arch_remaining_sanitizer_job() { # Run the "leftover" ASan/UBSan job (i.e. the one which is not run by # the `upstream-vagrant-archlinux-sanitizers` job for each PR) - ./agent-control.py --pool metal-ec2-c5n-centos-8s-x86_64 \ + ./agent-control.py --pool metal-ec2-c5n-centos-9s-x86_64 \ --vagrant arch-sanitizers-gcc \ --no-index \ ${ARGS:+"${ARGS[@]}"} - #./agent-control.py --pool metal-ec2-c5n-centos-8s-x86_64 \ + #./agent-control.py --pool metal-ec2-c5n-centos-9s-x86_64 \ # --vagrant arch-sanitizers-clang \ # --no-index \ # ${ARGS:+"${ARGS[@]}"} diff --git a/jenkins/runners/upstream-vagrant-archlinux-sanitizers-stable.sh b/jenkins/runners/upstream-vagrant-archlinux-sanitizers-stable.sh index 292b9be7..eee9dcb0 100644 --- a/jenkins/runners/upstream-vagrant-archlinux-sanitizers-stable.sh +++ b/jenkins/runners/upstream-vagrant-archlinux-sanitizers-stable.sh @@ -48,13 +48,13 @@ git clone https://github.com/systemd/systemd-centos-ci cd systemd-centos-ci # Run both jobs, since we don't run the other-half-of-this-job in cron in this case -./agent-control.py --pool metal-ec2-c5n-centos-8s-x86_64 \ +./agent-control.py --pool metal-ec2-c5n-centos-9s-x86_64 \ --bootstrap-args='-s https://github.com/systemd/systemd-stable.git' \ --no-index \ --vagrant arch-sanitizers-gcc \ ${ARGS:+"${ARGS[@]}"} -./agent-control.py --pool metal-ec2-c5n-centos-8s-x86_64 \ +./agent-control.py --pool metal-ec2-c5n-centos-9s-x86_64 \ --bootstrap-args='-s https://github.com/systemd/systemd-stable.git' \ --no-index \ --vagrant arch-sanitizers-clang \ diff --git a/jenkins/runners/upstream-vagrant-archlinux-sanitizers.sh b/jenkins/runners/upstream-vagrant-archlinux-sanitizers.sh index 5fa4714c..0355b672 100644 --- a/jenkins/runners/upstream-vagrant-archlinux-sanitizers.sh +++ b/jenkins/runners/upstream-vagrant-archlinux-sanitizers.sh @@ -47,12 +47,12 @@ fi git clone https://github.com/systemd/systemd-centos-ci cd systemd-centos-ci -#./agent-control.py --pool metal-ec2-c5n-centos-8s-x86_64 \ +#./agent-control.py --pool metal-ec2-c5n-centos-9s-x86_64 \ # --vagrant arch-sanitizers-gcc \ # --no-index \ # ${ARGS:+"${ARGS[@]}"} -./agent-control.py --pool metal-ec2-c5n-centos-8s-x86_64 \ +./agent-control.py --pool metal-ec2-c5n-centos-9s-x86_64 \ --vagrant arch-sanitizers-clang \ --no-index \ ${ARGS:+"${ARGS[@]}"} diff --git a/jenkins/runners/upstream-vagrant-archlinux-stable.sh b/jenkins/runners/upstream-vagrant-archlinux-stable.sh index fb5010c3..e21603aa 100644 --- a/jenkins/runners/upstream-vagrant-archlinux-stable.sh +++ b/jenkins/runners/upstream-vagrant-archlinux-stable.sh @@ -33,7 +33,7 @@ fi git clone https://github.com/systemd/systemd-centos-ci cd systemd-centos-ci -./agent-control.py --pool metal-ec2-c5n-centos-8s-x86_64 \ +./agent-control.py --pool metal-ec2-c5n-centos-9s-x86_64 \ --bootstrap-args='-s https://github.com/systemd/systemd-stable.git' \ --vagrant arch \ ${ARGS:+"${ARGS[@]}"} diff --git a/jenkins/runners/upstream-vagrant-archlinux.sh b/jenkins/runners/upstream-vagrant-archlinux.sh index d71fe40f..02638cc2 100644 --- a/jenkins/runners/upstream-vagrant-archlinux.sh +++ b/jenkins/runners/upstream-vagrant-archlinux.sh @@ -33,4 +33,4 @@ fi git clone https://github.com/systemd/systemd-centos-ci cd systemd-centos-ci -./agent-control.py --pool metal-ec2-c5n-centos-8s-x86_64 --vagrant arch ${ARGS:+"${ARGS[@]}"} +./agent-control.py --pool metal-ec2-c5n-centos-9s-x86_64 --vagrant arch ${ARGS:+"${ARGS[@]}"} diff --git a/jenkins/runners/upstream-vagrant-rawhide-selinux.sh b/jenkins/runners/upstream-vagrant-rawhide-selinux.sh index 9fab8fdf..c396d62d 100644 --- a/jenkins/runners/upstream-vagrant-rawhide-selinux.sh +++ b/jenkins/runners/upstream-vagrant-rawhide-selinux.sh @@ -20,4 +20,4 @@ ARGS=() git clone https://github.com/systemd/systemd-centos-ci cd systemd-centos-ci -./agent-control.py --pool metal-ec2-c5n-centos-8s-x86_64 --vagrant rawhide-selinux ${ARGS:+"${ARGS[@]}"} +./agent-control.py --pool metal-ec2-c5n-centos-9s-x86_64 --vagrant rawhide-selinux ${ARGS:+"${ARGS[@]}"} diff --git a/jenkins/runners/vagrant-make-cache.sh b/jenkins/runners/vagrant-make-cache.sh index 748cee1e..02628c48 100644 --- a/jenkins/runners/vagrant-make-cache.sh +++ b/jenkins/runners/vagrant-make-cache.sh @@ -45,11 +45,11 @@ set +e echo "Updating the systemd Arch Linux image" # Generate a new image with '-new' suffix - ./agent-control.py --pool metal-ec2-c5n-centos-8s-x86_64 --no-index --vagrant-sync Vagrantfile_archlinux_systemd ${ARGS:+"${ARGS[@]}"} + ./agent-control.py --pool metal-ec2-c5n-centos-9s-x86_64 --no-index --vagrant-sync Vagrantfile_archlinux_systemd ${ARGS:+"${ARGS[@]}"} # Check if it doesn't break anything - ./agent-control.py --pool metal-ec2-c5n-centos-8s-x86_64 --no-index --vagrant arch-new ${ARGS:+"${ARGS[@]}"} - ./agent-control.py --pool metal-ec2-c5n-centos-8s-x86_64 --no-index --vagrant arch-sanitizers-clang-new ${ARGS:+"${ARGS[@]}"} - ./agent-control.py --pool metal-ec2-c5n-centos-8s-x86_64 --no-index --vagrant arch-sanitizers-gcc-new ${ARGS:+"${ARGS[@]}"} + ./agent-control.py --pool metal-ec2-c5n-centos-9s-x86_64 --no-index --vagrant arch-new ${ARGS:+"${ARGS[@]}"} + ./agent-control.py --pool metal-ec2-c5n-centos-9s-x86_64 --no-index --vagrant arch-sanitizers-clang-new ${ARGS:+"${ARGS[@]}"} + ./agent-control.py --pool metal-ec2-c5n-centos-9s-x86_64 --no-index --vagrant arch-sanitizers-gcc-new ${ARGS:+"${ARGS[@]}"} # Overwrite the production image with the just tested one. Since the CentOS CI # artifact server supports only rsync protocol, use a single-purpose script # to do that @@ -67,7 +67,7 @@ fi echo "Updating the systemd/selinux Fedora Rawhide image" # Generate a new image with '-new' suffix - ./agent-control.py --pool metal-ec2-c5n-centos-8s-x86_64 --no-index --vagrant-sync Vagrantfile_rawhide_selinux ${ARGS:+"${ARGS[@]}"} + ./agent-control.py --pool metal-ec2-c5n-centos-9s-x86_64 --no-index --vagrant-sync Vagrantfile_rawhide_selinux ${ARGS:+"${ARGS[@]}"} # Overwrite the production image with the just tested one. Since the CentOS CI # artifact server supports only rsync protocol, use a single-purpose script # to do that diff --git a/vagrant/boxes/Vagrantfile_archlinux_systemd b/vagrant/boxes/Vagrantfile_archlinux_systemd index d80474a5..e40d5787 100644 --- a/vagrant/boxes/Vagrantfile_archlinux_systemd +++ b/vagrant/boxes/Vagrantfile_archlinux_systemd @@ -23,7 +23,7 @@ Vagrant.configure("2") do |config| libvirt.machine_type = "q35" # Emulate UEFI using OVMF - libvirt.loader = "/usr/share/OVMF/OVMF_CODE.fd" + libvirt.loader = "/usr/share/edk2/ovmf/OVMF_CODE.fd" libvirt.nvram = ovmf_nvram # Emulate TPM 2.0 using swtpm @@ -33,7 +33,7 @@ Vagrant.configure("2") do |config| end config.trigger.before [:up, :provision] do |trigger| - trigger.run = {inline: "cp -u /usr/share/OVMF/OVMF_VARS.fd #{ovmf_nvram}"} + trigger.run = {inline: "cp -u /usr/share/edk2/ovmf/OVMF_VARS.fd #{ovmf_nvram}"} end config.trigger.after [:destroy] do |trigger| diff --git a/vagrant/boxes/Vagrantfile_rawhide_selinux b/vagrant/boxes/Vagrantfile_rawhide_selinux index 996b3464..4176ec0e 100644 --- a/vagrant/boxes/Vagrantfile_rawhide_selinux +++ b/vagrant/boxes/Vagrantfile_rawhide_selinux @@ -24,7 +24,7 @@ Vagrant.configure("2") do |config| libvirt.machine_type = "q35" # Emulate UEFI using OVMF - libvirt.loader = "/usr/share/OVMF/OVMF_CODE.fd" + libvirt.loader = "/usr/share/edk2/ovmf/OVMF_CODE.fd" libvirt.nvram = ovmf_nvram # Emulate TPM 2.0 using swtpm @@ -34,7 +34,7 @@ Vagrant.configure("2") do |config| end config.trigger.before [:up, :provision] do |trigger| - trigger.run = {inline: "cp -u /usr/share/OVMF/OVMF_VARS.fd #{ovmf_nvram}"} + trigger.run = {inline: "cp -u /usr/share/edk2/ovmf/OVMF_VARS.fd #{ovmf_nvram}"} end config.trigger.after [:destroy] do |trigger| diff --git a/vagrant/test_scripts/test-arch.sh b/vagrant/test_scripts/test-arch.sh index 94a5572d..4e9c0f47 100755 --- a/vagrant/test_scripts/test-arch.sh +++ b/vagrant/test_scripts/test-arch.sh @@ -36,6 +36,7 @@ fi # Disable swap, since it seems to cause CPU soft lock-ups in some cases swapoff -av +swapon --show pushd /build || { echo >&2 "Can't pushd to /build"; exit 1; } diff --git a/vagrant/vagrant-make-cache.sh b/vagrant/vagrant-make-cache.sh index 2b4e348d..6a57c3e6 100755 --- a/vagrant/vagrant-make-cache.sh +++ b/vagrant/vagrant-make-cache.sh @@ -152,13 +152,13 @@ Vagrant.configure("2") do |config| config.vm.provider :libvirt do |libvirt| libvirt.random :model => 'random' libvirt.machine_type = "q35" - libvirt.loader = "/usr/share/OVMF/OVMF_CODE.fd" + libvirt.loader = "/usr/share/edk2/ovmf/OVMF_CODE.fd" libvirt.nvram = "/tmp/OVMF_VARS.fd" end end EOF -cp -fvL /usr/share/OVMF/OVMF_VARS.fd /tmp +cp -fvL /usr/share/edk2/ovmf/OVMF_VARS.fd /tmp chmod o+rw /tmp/OVMF_VARS.fd vagrant up --no-tty --provider=libvirt # shellcheck disable=SC2016 diff --git a/vagrant/vagrant-setup.sh b/vagrant/vagrant-setup.sh index 53c27a27..7bad5258 100755 --- a/vagrant/vagrant-setup.sh +++ b/vagrant/vagrant-setup.sh @@ -69,7 +69,7 @@ fi if ! vagrant plugin list | grep vagrant-libvirt; then # Install vagrant-libvirt dependencies - cmd_retry dnf -y install gcc libguestfs-tools-c libvirt libvirt-devel libgcrypt make qemu-kvm ruby-devel + cmd_retry dnf -y --enablerepo crb install gcc libguestfs-tools-c libvirt libvirt-devel libgcrypt make qemu-kvm ruby-devel # Start libvirt daemon systemctl start libvirtd systemctl status libvirtd @@ -88,9 +88,6 @@ fi vagrant --version vagrant plugin list -# Install OVMF so we can enable UEFI in the Vagrant VMs -# Local mirror of https://copr.fedorainfracloud.org/coprs/mrc0mmand/systemd-centos-ci-centos8/ -cmd_retry dnf -y config-manager --add-repo "https://jenkins-systemd.apps.ocp.cloud.ci.centos.org/job/reposync/lastSuccessfulBuild/artifact/repos/mrc0mmand-systemd-centos-ci-centos8-stream8/mrc0mmand-systemd-centos-ci-centos8-stream8.repo" cmd_retry dnf -y install edk2-ovmf # Configure NFS for Vagrant's shared folders diff --git a/vagrant/vagrantfiles/Vagrantfile_arch b/vagrant/vagrantfiles/Vagrantfile_arch index fbb2d736..a8786c38 100644 --- a/vagrant/vagrantfiles/Vagrantfile_arch +++ b/vagrant/vagrantfiles/Vagrantfile_arch @@ -53,9 +53,9 @@ Vagrant.configure("2") do |config| # Collect output from a serial console into a file to make debugging easier # The -nographic option allows us to collect BIOS messages as well libvirt.qemuargs :value => "-nographic" - libvirt.qemuargs :value => "-serial" + libvirt.graphics_type = "none" # This file needs to be collected later by vagrant-ci-wrapper.sh - libvirt.qemuargs :value => "file:/tmp/vagrant-arch-serial-console.log" + libvirt.serial :type => "file", :source => {:path => "/tmp/vagrant-arch-serial-console.log"} # Pass through /dev/random from the host to the VM libvirt.random :model => 'random' @@ -67,7 +67,7 @@ Vagrant.configure("2") do |config| libvirt.machine_type = "q35" # Emulate UEFI using OVMF - libvirt.loader = "/usr/share/OVMF/OVMF_CODE.fd" + libvirt.loader = "/usr/share/edk2/ovmf/OVMF_CODE.fd" libvirt.nvram = ovmf_nvram # Emulate TPM 2.0 using swtpm @@ -84,7 +84,7 @@ Vagrant.configure("2") do |config| ] config.trigger.before [:up, :provision] do |trigger| - trigger.run = {inline: "cp -u /usr/share/OVMF/OVMF_VARS.fd #{ovmf_nvram}"} + trigger.run = {inline: "cp -u /usr/share/edk2/ovmf/OVMF_VARS.fd #{ovmf_nvram}"} end config.trigger.after [:destroy] do |trigger| diff --git a/vagrant/vagrantfiles/Vagrantfile_rawhide b/vagrant/vagrantfiles/Vagrantfile_rawhide index 7a851d74..127c37b3 100644 --- a/vagrant/vagrantfiles/Vagrantfile_rawhide +++ b/vagrant/vagrantfiles/Vagrantfile_rawhide @@ -49,9 +49,9 @@ Vagrant.configure("2") do |config| # Collect output from a serial console into a file to make debugging easier # The -nographic option allows us to collect BIOS messages as well libvirt.qemuargs :value => "-nographic" - libvirt.qemuargs :value => "-serial" + libvirt.graphics_type = "none" # This file needs to be collected later by vagrant-ci-wrapper.sh - libvirt.qemuargs :value => "file:/tmp/vagrant-rawhide-serial-console.log" + libvirt.serial :type => "file", :source => {:path => "/tmp/vagrant-arch-serial-console.log"} # Pass through /dev/random from the host to the VM libvirt.random :model => 'random' @@ -63,7 +63,7 @@ Vagrant.configure("2") do |config| libvirt.machine_type = "q35" # Emulate UEFI using OVMF - libvirt.loader = "/usr/share/OVMF/OVMF_CODE.fd" + libvirt.loader = "/usr/share/edk2/ovmf/OVMF_CODE.fd" libvirt.nvram = ovmf_nvram # Emulate TPM 2.0 using swtpm @@ -73,7 +73,7 @@ Vagrant.configure("2") do |config| end config.trigger.before [:up, :provision] do |trigger| - trigger.run = {inline: "cp -u /usr/share/OVMF/OVMF_VARS.fd #{ovmf_nvram}"} + trigger.run = {inline: "cp -u /usr/share/edk2/ovmf/OVMF_VARS.fd #{ovmf_nvram}"} end config.trigger.after [:destroy] do |trigger|