Merge pull request #636 from konstruktoid/vagrantfile

replace focal with noble in the Vagrantfile
konstruktoid · May 3, 2024 · 6ee09b8 · 6ee09b8
2 parents 43070d9 + f60e2ec
commit 6ee09b8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 38 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -1,5 +1,6 @@
 Vagrant.configure("2") do |config|
-  config.vbguest.installer_options = { allow_kernel_upgrade: true }
+  config.vbguest.installer_options = { allow_kernel_upgrade: false }
+  config.vbguest.auto_update = false
   config.vm.provider "virtualbox" do |vb|
     vb.customize ["modifyvm", :id, "--uart1", "0x3F8", "4"]
     vb.customize ["modifyvm", :id, "--uartmode1", "disconnected"]
@@ -10,7 +11,6 @@ Vagrant.configure("2") do |config|
     bullseye_vlan.ssh.insert_key = true
     bullseye_vlan.vm.hostname = "bullseye-vlan"
     bullseye_vlan.vm.boot_timeout = 600
-    bullseye_vlan.vbguest.auto_update = false
     bullseye_vlan.vm.provision "shell",
       inline: "ip link set dev eth0 down; ip link set eth0 name eth0.101; ip link set dev eth0.101 up; dhclient -r eth0.101; dhclient eth0.101"
     bullseye_vlan.vm.provision "shell",
@@ -35,7 +35,6 @@ Vagrant.configure("2") do |config|
     bullseye.ssh.insert_key = true
     bullseye.vm.hostname = "bullseye"
     bullseye.vm.boot_timeout = 600
-    bullseye.vbguest.auto_update = false
     bullseye.vm.provision "shell",
       inline: "apt-get update && apt-get -y install curl python3-pip && python3 -m pip install ansible"
     bullseye.vm.provision "ansible" do |a|
@@ -57,10 +56,9 @@ Vagrant.configure("2") do |config|
     bookworm.ssh.insert_key = true
     bookworm.vm.hostname = "bookworm"
     bookworm.vm.boot_timeout = 600
-    bookworm.vbguest.auto_update = false
     bookworm.vm.provision "shell",
-    # Remove EXTERNALLY-MANAGED to ignore PEP 668 implementation in Deb12
-      inline: "apt-get update && apt-get -y install python3-pip curl && rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED && python3 -m pip install ansible" 
+    # Remove EXTERNALLY-MANAGED to ignore PEP 668
+      inline: "apt-get update && apt-get -y install python3-pip curl && rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED && python3 -m pip install ansible"
     bookworm.vm.provision "ansible" do |a|
       a.verbose = "v"
       a.limit = "all"
@@ -75,14 +73,14 @@ Vagrant.configure("2") do |config|
     end
   end
 
-  config.vm.define "focal" do |focal|
-    focal.vm.box = "ubuntu/focal64"
-    focal.ssh.insert_key = true
-    focal.vm.hostname = "focal"
-    focal.vm.boot_timeout = 600
-    focal.vm.provision "shell",
+  config.vm.define "jammy" do |jammy|
+    jammy.vm.box = "bento/ubuntu-22.04"
+    jammy.ssh.insert_key = true
+    jammy.vm.hostname = "jammy"
+    jammy.vm.boot_timeout = 600
+    jammy.vm.provision "shell",
       inline: "apt-get update && apt-get -y install curl python3-pip && python3 -m pip install ansible"
-    focal.vm.provision "ansible" do |a|
+    jammy.vm.provision "ansible" do |a|
       a.verbose = "v"
       a.limit = "all"
       a.playbook = "tests/test.yml"
@@ -94,14 +92,15 @@ Vagrant.configure("2") do |config|
      end
    end
 
-  config.vm.define "jammy" do |jammy|
-    jammy.vm.box = "ubuntu/jammy64"
-    jammy.ssh.insert_key = true
-    jammy.vm.hostname = "jammy"
-    jammy.vm.boot_timeout = 600
-    jammy.vm.provision "shell",
-      inline: "apt-get update && apt-get -y install curl python3-pip && python3 -m pip install ansible"
-    jammy.vm.provision "ansible" do |a|
+  config.vm.define "noble" do |noble|
+    noble.vm.box = "bento/ubuntu-24.04"
+    noble.ssh.insert_key = true
+    noble.vm.hostname = "noble"
+    noble.vm.boot_timeout = 600
+    noble.vm.provision "shell",
+    # Ignore PEP 668
+      inline: "apt-get update && apt-get -y install python3-pip curl && python3 -m pip install --break-system-packages ansible"
+    noble.vm.provision "ansible" do |a|
       a.verbose = "v"
       a.limit = "all"
       a.playbook = "tests/test.yml"
@@ -116,7 +115,6 @@ Vagrant.configure("2") do |config|
   config.vm.define "almalinux" do |almalinux|
     almalinux.vm.box = "almalinux/9"
     almalinux.ssh.insert_key = true
-    almalinux.vbguest.auto_update = false
     almalinux.vm.provider "virtualbox" do |c|
       c.default_nic_type = "82543GC"
       c.memory = 2048

diff --git a/meta/main.yml b/meta/main.yml
@@ -18,6 +18,7 @@ galaxy_info:
       versions:
         - focal
         - jammy
+        - noble
   galaxy_tags:
     - almalinux
     - centos

diff --git a/molecule/ubuntu/molecule.yml b/molecule/ubuntu/molecule.yml
@@ -17,13 +17,6 @@ provisioner:
   log: true
   inventory:
     host_vars:
-      focal:
-        sshd_admin_net:
-          - "0.0.0.0/0"
-        sshd_allow_groups:
-          - vagrant
-          - sudo
-        umask_value: "027"
       jammy:
         sshd_admin_net:
           - "0.0.0.0/0"
@@ -36,14 +29,6 @@ provisioner:
         sshd_allow_groups:
           - vagrant
 platforms:
-  - name: focal
-    box: bento/ubuntu-20.04
-    config_options:
-      vm.boot_timeout: 600
-    instance_raw_config_args:
-      - "vbguest.installer_options = { allow_kernel_upgrade: false }"
-      - vbguest.auto_update = false
-    memory: 1024
   - name: jammy
     box: bento/ubuntu-22.04
     config_options:
@@ -57,7 +42,7 @@ platforms:
       - vbguest.auto_update = false
     memory: 1024
   - name: noble
-    box: bento/noble64
+    box: bento/ubuntu-24.04
     config_options:
       vm.boot_timeout: 600
       synced_folder: false

diff --git a/tests/debug_facts.yml b/tests/debug_facts.yml
@@ -3,6 +3,7 @@
   ansible.builtin.pip:
     name: jmespath
     state: present
+    extra_args: "{{ '--break-system-packages' if (ansible_python_version is version('3.11', '>=')) else '--user' }}"
 
 - name: Debug "cpuinfo_rdrand handling, true"
   ansible.builtin.debug: