vagrant: default 22.04

ponty · Jun 12, 2022 · f3dca8a · f3dca8a
1 parent becd0f5
commit f3dca8a
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 50 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -1,18 +1,13 @@
 Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/focal64"
+  config.vm.box = "ubuntu/jammy64"
 
   config.vm.provider "virtualbox" do |vb|
-    #vb.gui = true
-    vb.memory = "2048"
-
-    vb.name = "pyvirtualdisplay_ubuntu2004"
-
-    # 	https://bugs.launchpad.net/cloud-images/+bug/1829625
-    # vb.customize ["modifyvm", :id, "--uart1", "0x3F8", "4"]
-    # vb.customize ["modifyvm", :id, "--uartmode1", "file", "./ttyS0.log"]
+    vb.name = "pyvirtualdisplay_ubuntu2204_main"
+    #   vb.gui = true
+    vb.memory = "2048" 
   end
 
-  config.vm.provision "shell", path: "tests/vagrant/ubuntu2004.sh"
+  config.vm.provision "shell", path: "tests/vagrant/ubuntu2204.sh"
 
   config.ssh.extra_args = ["-t", "cd /vagrant; bash --login"]
 end
diff --git a/tests/vagrant/Vagrantfile.ubuntu2004.rb b/tests/vagrant/Vagrantfile.ubuntu2004.rb
@@ -0,0 +1,16 @@
+Vagrant.configure(2) do |config|
+  config.vm.box = "ubuntu/focal64"
+
+  config.vm.provider "virtualbox" do |vb|
+    #vb.gui = true
+    vb.memory = "2048"
+
+    vb.name = "pyvirtualdisplay_ubuntu2004"
+  end
+
+  config.vm.provision "shell", path: "tests/vagrant/ubuntu2004.sh"
+  config.ssh.extra_args = ["-t", "cd /vagrant; bash --login"]
+end
+
+# export VAGRANT_VAGRANTFILE=tests/vagrant/Vagrantfile.20.04.rb;export VAGRANT_DOTFILE_PATH=.vagrant_${VAGRANT_VAGRANTFILE}
+# vagrant up && vagrant ssh
diff --git a/tests/vagrant/Vagrantfile.ubuntu2204.rb b/tests/vagrant/Vagrantfile.ubuntu2204.rb
@@ -1,6 +1,5 @@
 Vagrant.configure(2) do |config|
   config.vm.box = "ubuntu/jammy64"
-  config.vm.box_version = "20220104.0.0"
 
   config.vm.provider "virtualbox" do |vb|
     vb.name = "pyvirtualdisplay_ubuntu2204"

diff --git a/tests/vagrant/ubuntu1804.sh b/tests/vagrant/ubuntu1804.sh
@@ -4,16 +4,8 @@ sudo update-locale LANG=en_US.UTF-8 LANGUAGE=en.UTF-8
 # echo 'export export LC_ALL=C' >> /home/vagrant/.profile
 
 # install python versions
-sudo add-apt-repository --yes ppa:deadsnakes/ppa
+# sudo add-apt-repository --yes ppa:deadsnakes/ppa
 sudo apt-get update
-sudo apt-get install -y python3.6-dev
-sudo apt-get install -y python3.7-dev
-sudo apt-get install -y python3.8-dev
-sudo apt-get install -y python3-distutils
-sudo apt-get install -y python3.9-dev
-sudo apt-get install -y python3.9-distutils
-sudo apt-get install -y python3.10-dev
-sudo apt-get install -y python3.10-distutils
 
 # tools
 sudo apt-get install -y mc python3-pip xvfb

diff --git a/tests/vagrant/ubuntu2004.sh b/tests/vagrant/ubuntu2004.sh
@@ -4,16 +4,8 @@ sudo update-locale LANG=en_US.UTF-8 LANGUAGE=en.UTF-8
 # echo 'export export LC_ALL=C' >> /home/vagrant/.profile
 
 # install python versions
-sudo add-apt-repository --yes ppa:deadsnakes/ppa
+# sudo add-apt-repository --yes ppa:deadsnakes/ppa
 sudo apt-get update
-sudo apt-get install -y python3.6-dev
-sudo apt-get install -y python3.7-dev
-sudo apt-get install -y python3.8-dev
-sudo apt-get install -y python3-distutils
-sudo apt-get install -y python3.9-dev
-sudo apt-get install -y python3.9-distutils
-sudo apt-get install -y python3.10-dev
-sudo apt-get install -y python3.10-distutils
 
 # tools
 sudo apt-get install -y mc python3-pip xvfb

diff --git a/tests/vagrant/ubuntu2204.sh b/tests/vagrant/ubuntu2204.sh
@@ -4,16 +4,23 @@ sudo update-locale LANG=en_US.UTF-8 LANGUAGE=en.UTF-8
 # echo 'export export LC_ALL=C' >> /home/vagrant/.profile
 
 # install python versions
-# sudo add-apt-repository --yes ppa:deadsnakes/ppa
+sudo add-apt-repository --yes ppa:deadsnakes/ppa
 sudo apt-get update
-# sudo apt-get install -y python3.6-dev
-# sudo apt-get install -y python3.7-dev
-# sudo apt-get install -y python3.8-dev
-# sudo apt-get install -y python3-distutils
-# sudo apt-get install -y python3.9-dev
-# sudo apt-get install -y python3.9-distutils
-# sudo apt-get install -y python3.10-dev
-# sudo apt-get install -y python3.10-distutils
+
+sudo apt-get install -y python3.7-dev
+sudo apt-get install -y python3.7-distutils
+
+sudo apt-get install -y python3.8-dev
+sudo apt-get install -y python3.8-distutils
+
+sudo apt-get install -y python3.9-dev
+sudo apt-get install -y python3.9-distutils
+
+sudo apt-get install -y python3.10-dev
+sudo apt-get install -y python3.10-distutils
+
+sudo apt-get install -y python3.11-dev
+sudo apt-get install -y python3.11-distutils
 
 # tools
 sudo apt-get install -y mc python3-pip xvfb

diff --git a/tests/vagrant/vagrant_boxes.py b/tests/vagrant/vagrant_boxes.py
@@ -76,26 +76,26 @@ def run_box(options, vagrantfile, cmds):
 
 
 config = {
-    "debian10": (
-        "Vagrantfile.debian10.rb",
-        ["tox -e py37"],
-    ),
-    "debian11": (
-        "Vagrantfile.debian11.rb",
-        ["tox -e py39"],
-    ),
     "ubuntu2204": (
         "Vagrantfile.ubuntu2204.rb",
-        ["tox -e py39"],
+        ["tox", "PYVIRTUALDISPLAY_DISPLAYFD=0 tox"],
     ),
     "ubuntu2004": (
-        "Vagrantfile",
-        ["tox", "PYVIRTUALDISPLAY_DISPLAYFD=0 tox"],
+        "Vagrantfile.ubuntu2004.rb",
+        ["tox -e py38"],
     ),
     "ubuntu1804": (
         "Vagrantfile.ubuntu1804.rb",
         ["tox -e py36"],
     ),
+    "debian11": (
+        "Vagrantfile.debian11.rb",
+        ["tox -e py39"],
+    ),
+    "debian10": (
+        "Vagrantfile.debian10.rb",
+        ["tox -e py37"],
+    ),
     # "osx": (
     #     "Vagrantfile.osx.rb",
     #     [

diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,11 @@
 
 [tox]
 envlist = 
+      ; py311
       py310
       py39
       py38
       py37
-      py36
       py310-doc
       py310-lint