vagrant testing: update distros

install.py

@@ -241,6 +241,16 @@ def cmd_deps_system(parser, args):
         except Exception:
             pass
 
+    if not distribution:
+        try:
+            with open('/etc/redhat-release', 'r') as f:
+                x = f.read()
+                if x:
+                    distribution = 'rpm'
+
+        except Exception:
+            pass
+
     if not distribution:
         sys.exit(
             'Cannot determine platform for automatic prerequisite '

maintenance/vagrant/centos-7/inside.sh

@@ -39,6 +39,7 @@ ln -s "/vagrant/pyrocko-test-data" "test/data"
 ln -s "/vagrant/example_run_dir" "test/example_run_dir"
 
 python install.py deps conda --yes && \
+    conda install --yes pytest && \
     python install.py user --yes && \
     python -m pyrocko.print_version deps >> "$outfile_py3" && \
     python -m pytest -v  "$thetest" > >(tee -a "$outfile_py3") 2> >(tee -a "$outfile_py3" >&2) || \

maintenance/vagrant/centos-8/Vagrantfile

@@ -1,10 +0,0 @@
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "centos/8"
-  config.vm.provider "virtualbox" do |vb|
-     vb.customize ["modifyvm", :id, "--memory", "3072"]
-  end
-  config.vm.network :private_network, ip: '192.168.115.16'
-  config.vm.network :forwarded_port, guest: 22, host: 22016, id: 'ssh'
-end

maintenance/vagrant/debian-9/Vagrantfile

@@ -1,11 +0,0 @@
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "debian/contrib-stretch64"
-  config.vm.synced_folder "../../../test/data", "/pyrocko-test-data"
-  config.vm.provider "virtualbox" do |vb|
-     vb.customize ["modifyvm", :id, "--memory", "3072"]
-  end
-  config.vm.network :private_network, ip: '192.168.115.5'
-  config.vm.network :forwarded_port, guest: 22, host: 22005, id: 'ssh'
-end

maintenance/vagrant/debian-9/inside.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-set -e
-
-branch="$1"
-if [ -z "$branch" ]; then
-    branch=master
-fi
-
-thetest="$2"
-if [ -z "$thetest" ]; then
-    thetest="test"
-fi
-
-pyrockodir="pyrocko-$branch"
-outfile_py3="/vagrant/test-$branch.py3.out"
-
-rm -f "$outfile_py3"
-
-cd $HOME
-export LC_ALL="C"
-
-/vagrant/wait_dpkg_locks.sh
-
-sudo apt-get update -y
-sudo apt-get upgrade -y
-sudo apt-get install -y git python3-setuptools xvfb
-sudo apt-get install -y libgles2-mesa
-
-if [ -e "$pyrockodir" ] ; then
-    sudo rm -rf "$pyrockodir"
-fi
-git clone -b $branch "/vagrant/pyrocko.git" "$pyrockodir"
-cd "$pyrockodir"
-ln -s "/pyrocko-test-data" "test/data"
-ln -s "/vagrant/example_run_dir" "test/example_run_dir"
-
-python3 install.py deps system --yes && \
-    sudo pip3 install --no-deps --force-reinstall --upgrade . && \
-    python3 -m pyrocko.print_version deps >> "$outfile_py3" && \
-    xvfb-run -s '-screen 0 640x480x24' python3 -m pytest -v  "$thetest" > >(tee -a "$outfile_py3") 2> >(tee -a "$outfile_py3" >&2) || \
-    /bin/true

maintenance/vagrant/fedora36/Vagrantfile

@@ -0,0 +1,13 @@
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "generic/fedora36"
+  config.vm.provider "virtualbox" do |vb|
+     vb.customize ["modifyvm", :id, "--memory", "3072"]
+  end
+  config.vm.network :private_network, ip: '192.168.115.19'
+  config.vm.network :forwarded_port, guest: 22, host: 22019, id: 'ssh'
+  config.vm.synced_folder ".", "/vagrant",
+    type: "rsync",
+    rsync__chown: true
+end

maintenance/vagrant/fedora36/inside.sh

@@ -18,8 +18,8 @@ outfile_py3="/vagrant/test-$branch.py3.out"
 rm -f "$outfile_py3"
 
 cd $HOME
-sudo sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
-sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+#sudo sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+#sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
 sudo yum -y update
 
 sudo yum -y install git make gcc mesa-libGL python3 patch

maintenance/vagrant/fedora37/Vagrantfile

@@ -0,0 +1,13 @@
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "generic/fedora37"
+  config.vm.provider "virtualbox" do |vb|
+     vb.customize ["modifyvm", :id, "--memory", "3072"]
+  end
+  config.vm.network :private_network, ip: '192.168.115.18'
+  config.vm.network :forwarded_port, guest: 22, host: 22018, id: 'ssh'
+  config.vm.synced_folder ".", "/vagrant",
+    type: "rsync",
+    rsync__chown: true
+end

maintenance/vagrant/fedora37/inside.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+set -e
+
+branch="$1"
+if [ -z "$branch" ]; then
+    branch=master
+fi
+
+thetest="$2"
+if [ -z "$thetest" ]; then
+    thetest="test"
+fi
+
+pyrockodir="pyrocko-$branch"
+outfile_py3="/vagrant/test-$branch.py3.out"
+
+rm -f "$outfile_py3"
+
+cd $HOME
+#sudo sed -i 's/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+#sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+sudo yum -y update
+
+sudo yum -y install git make gcc mesa-libGL python3 patch
+
+if [ -e "$pyrockodir" ] ; then
+    sudo rm -rf "$pyrockodir"
+fi
+git clone -b "$branch" "/vagrant/pyrocko.git" "$pyrockodir"
+cd "$pyrockodir"
+ln -s "/vagrant/pyrocko-test-data" "test/data"
+ln -s "/vagrant/example_run_dir" "test/example_run_dir"
+
+python3=/usr/bin/python3
+pip3=/usr/bin/pip3
+"$python3" install.py deps system --yes && \
+    sudo "$pip3" install --no-deps --force-reinstall --upgrade . && \
+    "$python3" -m pyrocko.print_version deps >> "$outfile_py3" && \
+    "$python3" -m pytest -v  "$thetest" > >(tee -a "$outfile_py3") 2> >(tee -a "$outfile_py3" >&2) || \
+    /bin/true

maintenance/vagrant/fedora37/outside.sh

@@ -14,8 +14,9 @@ if [ -z "$thetest" ]; then
     thetest="test"
 fi
 
-rm -rf example_run_dir pyrocko.git *.out *.log
+rm -rf pyrocko.git pyrocko-test-data example_run_dir *.out *.log
 git clone --bare "../../.." "pyrocko.git"
+cp -a "../../../test/data" pyrocko-test-data
 cp -a "../../../test/example_run_dir" example_run_dir
 
 echo "testing branch: $branch"
@@ -23,6 +24,8 @@ echo "running test: $thetest"
 echo "testing branch $branch" >> log.out
 date -uIseconds >> log.out
 vagrant up
-vagrant ssh -- -X /vagrant/inside.sh "$branch" "$thetest" > >(tee -a "log.out") 2> >(tee -a "log.out" >&2) || /bin/true
+vagrant rsync
+vagrant ssh -- /vagrant/inside.sh "$branch" "$thetest" > >(tee -a "log.out") 2> >(tee -a "log.out" >&2) || /bin/true
+vagrant rsync-back || ( vagrant plugin install vagrant-rsync-back && vagrant rsync-back )
 vagrant halt
 date -uIseconds >> log.out

maintenance/vagrant/ubuntu-16.04/inside.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-set -e
-
-branch="$1"
-if [ -z "$branch" ]; then
-    branch=master
-fi
-
-thetest="$2"
-if [ -z "$thetest" ]; then
-    thetest="test"
-fi
-
-pyrockodir="pyrocko-$branch"
-outfile_py3="/vagrant/test-$branch.py3.out"
-
-rm -f "$outfile_py3"
-
-cd $HOME
-
-export LC_ALL="C"
-
-/vagrant/wait_dpkg_locks.sh
-
-sudo apt-get update -y
-sudo apt-get upgrade -y
-sudo apt-get install -y git python3-setuptools xvfb
-
-if [ -e "$pyrockodir" ] ; then
-    sudo rm -rf "$pyrockodir"
-fi
-git clone -b $branch "/vagrant/pyrocko.git" "$pyrockodir"
-cd "$pyrockodir"
-ln -s "/pyrocko-test-data" "test/data"
-ln -s "/vagrant/example_run_dir" "test/example_run_dir"
-
-python3 install.py deps system --yes && \
-    sudo pip3 install --no-deps --force-reinstall --upgrade . && \
-    python3 -m pyrocko.print_version deps >> "$outfile_py3" && \
-    xvfb-run -s '-screen 0 640x480x24' python3 -m pytest -v "$thetest" > >(tee -a "$outfile_py3") 2> >(tee -a "$outfile_py3" >&2) || \
-    /bin/true

maintenance/vagrant/ubuntu-16.04/wait_dpkg_locks.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-sleep 5
-
-while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
-    echo -en "Waiting for other software managers to finish..."
-    sleep 5
-done
-
-while sudo fuser /var/lib/dpkg/lock-frontend >/dev/null 2>&1 ; do
-    echo -en "Waiting for other software managers to finish..."
-    sleep 5
-done

maintenance/vagrant/ubuntu-18.04/Vagrantfile

@@ -1,11 +0,0 @@
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "ubuntu/bionic64"
-  config.vm.synced_folder "../../../test/data", "/pyrocko-test-data"
-  config.vm.provider "virtualbox" do |vb|
-     vb.customize ["modifyvm", :id, "--memory", "3072"]
-  end
-  config.vm.network :private_network, ip: '192.168.115.10'
-  config.vm.network :forwarded_port, guest: 22, host: 22010, id: 'ssh'
-end

maintenance/vagrant/ubuntu-18.04/outside.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -e
-
-branch="$1"
-
-if [ -z "$branch" ]; then
-    branch=`git rev-parse --abbrev-ref HEAD`
-fi
-
-thetest="$2"
-
-if [ -z "$thetest" ]; then
-    thetest="test"
-fi
-
-rm -rf example_run_dir pyrocko.git *.out *.log
-git clone --bare "../../.." "pyrocko.git"
-cp -a "../../../test/example_run_dir" example_run_dir
-
-echo "testing branch: $branch"
-echo "running test: $thetest"
-echo "testing branch $branch" >> log.out
-date -uIseconds >> log.out
-vagrant up
-vagrant ssh -- -X /vagrant/inside.sh "$branch" "$thetest" > >(tee -a "log.out") 2> >(tee -a "log.out" >&2) || /bin/true
-vagrant halt
-date -uIseconds >> log.out

maintenance/vagrant/ubuntu-18.04/wait_dpkg_locks.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-sleep 5
-
-while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
-    echo -en "Waiting for other software managers to finish..."
-    sleep 5
-done
-
-while sudo fuser /var/lib/dpkg/lock-frontend >/dev/null 2>&1 ; do
-    echo -en "Waiting for other software managers to finish..."
-    sleep 5
-done

maintenance/vagrant/ubuntu-22.04/Vagrantfile

@@ -1,11 +1,11 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "ubuntu/xenial64"
+  config.vm.box = "ubuntu/jammy64"
   config.vm.synced_folder "../../../test/data", "/pyrocko-test-data"
   config.vm.provider "virtualbox" do |vb|
      vb.customize ["modifyvm", :id, "--memory", "3072"]
   end
-  config.vm.network :private_network, ip: '192.168.115.9'
-  config.vm.network :forwarded_port, guest: 22, host: 22009, id: 'ssh'
+  config.vm.network :private_network, ip: '192.168.115.17'
+  config.vm.network :forwarded_port, guest: 22, host: 22017, id: 'ssh'
 end

maintenance/vagrant/ubuntu-22.04/inside.sh

@@ -34,7 +34,7 @@ ln -s "/pyrocko-test-data" "test/data"
 ln -s "/vagrant/example_run_dir" "test/example_run_dir"
 
 python3 install.py deps system --yes && \
-    sudo pip3 install --no-deps --force-reinstall --upgrade . && \
+    python3 install.py system --yes && \
     python3 -m pyrocko.print_version deps >> "$outfile_py3" && \
     xvfb-run -s '-screen 0 640x480x24' python3 -m pytest -v "$thetest" > >(tee -a "$outfile_py3") 2> >(tee -a "$outfile_py3" >&2) || \
     /bin/true

prerequisites/prerequisites_centos_python3.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-sudo yum -y install epel-release dnf-plugins-core
-sudo yum config-manager --set-enabled powertools
-
-sudo yum -y install make gcc patch git python3 python3-yaml python3-matplotlib python3-numpy \
-    python3-scipy python3-requests python3-coverage python3-pytest python3-jinja2 \
-    python3-qt5 python3-matplotlib-qt5

prerequisites/prerequisites_rpm_python3.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+sudo yum -y install epel-release dnf-plugins-core
+sudo yum config-manager --set-enabled powertools
+
+sudo yum -y install make gcc patch git python3 python3-wheel python3-yaml \
+    python3-matplotlib python3-numpy python3-scipy python3-requests \
+    python3-coverage python3-pytest python3-jinja2 python3-qt5 \
+    python3-matplotlib-qt5