Internal testing fixes and updated CHANGELOG.md

haxorof · Dec 8, 2024 · 595ff5b · 595ff5b
1 parent 6a58087
commit 595ff5b
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 80 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Improved handling between different package managers related to RedHat varity (e.g. yum, dnf, dnf5)
 
+## Deprecated
+
+- Support for Python 2
+- Support for RHEL 7 and CentOS 7
+- Support for ansible-core 2.16
+- Linux Mint 18 and 19 in experimental variable `docker_x_mint_ubuntu_mapping`
+
+## Internal
+
+- Commented out and removed config related to testing with additional disk.
+
 ## [6.0.1](../../releases/tag/6.0.1) - 2024-09-07
 
 ## Fixed

diff --git a/tests/Vagrantfile b/tests/Vagrantfile
@@ -35,11 +35,11 @@ if File.exist?(testcase_file)
       testmachine.vm.network "private_network", ip: "192.168.56.21", virtualbox__intnet: true
       testmachine.vm.synced_folder ".", "/vagrant", disabled: true
       testmachine.vm.provider "virtualbox" do |vb|
-        docker_disk = 'extra_disk/docker_disk.vdi'
-        unless File.exist?(docker_disk)
-          vb.customize ['createhd', '--filename', docker_disk, '--size', 5 * 1024]
-        end
-        vb.customize ['storageattach', :id, '--storagectl', vagrant_config['storage_ctl'], '--port', vagrant_config['storage_port'], '--device', 0, '--type', 'hdd', '--medium', docker_disk]
+        # docker_disk = 'extra_disk/docker_disk.vdi'
+        # unless File.exist?(docker_disk)
+        #   vb.customize ['createhd', '--filename', docker_disk, '--size', 5 * 1024]
+        # end
+        # vb.customize ['storageattach', :id, '--storagectl', vagrant_config['storage_ctl'], '--port', vagrant_config['storage_port'], '--device', 0, '--type', 'hdd', '--medium', docker_disk]
 
         mem_divisor = 2
         cpu_divisor = 2
@@ -119,7 +119,7 @@ if File.exist?(testcase_file)
           chmod 0600 /home/vagrant/.ssh/id_rsa && chown -R vagrant:vagrant /home/vagrant/.ssh)"
 
       machine.vm.provision "shell",
-      inline: "dnf -y install epel-release && dnf -y install curl gcc libffi-devel openssl-devel python3-devel python3-setuptools python3.11-pip python3.11-devel python3.11-setuptools haveged sshpass && \
+      inline: "dnf -y install epel-release && dnf -y update && dnf -y install curl gcc libffi-devel openssl-devel python3-devel python3-setuptools python3.11-pip python3.11-devel python3.11-setuptools haveged sshpass && \
         pip3.11 install ansible==#{vagrant_config['ansible_version']}"
 
       # Prepare
@@ -135,9 +135,9 @@ if File.exist?(testcase_file)
         ansible.inventory_path = "hosts"
         ansible.config_file = "/vagrant/ansible.cfg"
         ansible.raw_arguments = ["#{ENV['ANSIBLE_ARG_0']}"]
-        ansible.extra_vars = {
-          lvm_device: "#{vagrant_devs[vagrant_config['storage_port']]}"
-        }
+        # ansible.extra_vars = {
+        #   lvm_device: "#{vagrant_devs[vagrant_config['storage_port']]}"
+        # }
       end
 
       # Cannot trigger reboot via Ansible since Vagrant do network changes
@@ -155,9 +155,9 @@ if File.exist?(testcase_file)
         ansible.inventory_path = "hosts"
         ansible.config_file = "/vagrant/ansible.cfg"
         ansible.raw_arguments = ["#{ENV['ANSIBLE_ARG_0']}"]
-        ansible.extra_vars = {
-          lvm_device: "#{vagrant_devs[vagrant_config['storage_port']]}"
-        }
+        # ansible.extra_vars = {
+        #   lvm_device: "#{vagrant_devs[vagrant_config['storage_port']]}"
+        # }
       end
     end
 

diff --git a/tests/manual/test_uninstall.yml b/tests/manual/test_uninstall.yml
@@ -6,7 +6,7 @@
   pre_tasks:
     - name: Find files and diretories with docker in it (Before)
       become: yes
-      shell: find / -name "docker*"
+      shell: find / -name 'docker*'
       register: _files
 
     - set_fact:

diff --git a/tests/vagrant_testconfig.yml b/tests/vagrant_testconfig.yml
@@ -1,148 +1,106 @@
 # Regression tests are run using minimum supported Ansible version
 # https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html
-ansible_version: "9.7.0"
+ansible_version: "9.13.0"
 # Dropped support for Python 2.7 in 10 and later
-# ansible_version: "10.1.0"
+# ansible_version: "11.1.0"
 galaxy_role_name: haxorof.docker_ce
 role_dir: ansible-role-docker-ce
 
 boxes:
   - # AlmaLinux 8
-    #box: almalinux/8
     box: generic/alma8
     box_url: vagrantup
-    storage_ctl: SATA Controller
-    storage_port: 1
     vbguest_update: false
     reboot: false
   - # AlmaLinux 9
-    #box: almalinux/9
     box: generic/alma9
     box_url: vagrantup
-    storage_ctl: SATA Controller
-    storage_port: 1
+    vbguest_update: false
+    reboot: false
+  - # Rocky Linux 8
+    box: generic/rocky8
+    box_url: vagrantup
+    vbguest_update: false
+    reboot: false
+  - # Rocky Linux 9
+    box: generic/rocky9
+    box_url: vagrantup
     vbguest_update: false
     reboot: false
   # Testing only supported releases: https://endoflife.date/centos-stream
   # and supported by Docker CE
   # - # CentOS Stream 9
   #   box: centos/stream9
   #   box_url: vagrantup
-  #   storage_ctl: IDE
-  #   storage_port: 1
   #   vbguest_update: false
   #   reboot: false
+  # Testing only supported releases: https://endoflife.date/fedora / https://fedoraproject.org/wiki/End_of_life
+  # and supported by Docker CE
+  # Unfortunately no new and working Fedora Vagrant boxes available
+  # - # F37
+  #   box: generic/fedora37
+  #   box_url: vagrantup
+  #   vbguest_update: false
+  #   reboot: true
     # Testing only supported releases: https://endoflife.date/debian / https://wiki.debian.org/LTS
     # and supported by Docker CE
   - # Bullseye
     box: generic/debian11
     box_url: vagrantup
-    storage_ctl: SATA Controller
-    storage_port: 1
     vbguest_update: false
     reboot: false
   - # Bookworm
     box: generic/debian12
     box_url: vagrantup
-    storage_ctl: SATA Controller
-    storage_port: 1
-    vbguest_update: false
-    reboot: false
-  # Testing only supported releases: https://endoflife.date/fedora / https://fedoraproject.org/wiki/End_of_life
-  # and supported by Docker CE
-  # - # F39
-  #   box: generic/fedora39
-  #   box_url: vagrantup
-  #   storage_ctl: SATA Controller
-  #   storage_port: 1
-  #   vbguest_update: false
-  #   reboot: true
-  # - # F40
-  #   box: generic/fedora40
-  #   box_url: vagrantup
-  #   storage_ctl: SATA Controller
-  #   storage_port: 1
-  #   vbguest_update: false
-  #   reboot: true
-  - # Rocky Linux 8
-    box: generic/rocky8
-    box_url: vagrantup
-    storage_ctl: SATA Controller
-    storage_port: 1
-    vbguest_update: false
-    reboot: false
-  - # Rocky Linux 9
-    box: generic/rocky9
-    box_url: vagrantup
-    storage_ctl: SATA Controller
-    storage_port: 1
     vbguest_update: false
     reboot: false
   # Testing only supported LTS releases: https://endoflife.date/ubuntu / https://wiki.ubuntu.com/Releases
   # and supported by Docker CE
   - # Focal Fossa
     box: generic/ubuntu2004
     box_url: vagrantup
-    storage_ctl: SATA Controller
-    storage_port: 1
     vbguest_update: false
     reboot: false
   - # Jammy Jellyfish
     box: generic/ubuntu2204
     box_url: vagrantup
-    storage_ctl: SATA Controller
-    storage_port: 1
     vbguest_update: false
     reboot: false
-  # - # Noble Numbat
-  #   box: generic/ubuntu2404
-  #   box_url: vagrantup
-  #   storage_ctl: SATA Controller
-  #   storage_port: 1
-  #   vbguest_update: false
-  #   reboot: false
+  - # Noble Numbat
+    box: gutehall/ubuntu24-04
+    box_url: vagrantup
+    vbguest_update: false
+    reboot: false
   - # Amazon Linux 2023
     box: gbailey/al2023
     box_url: vagrantup
-    storage_ctl: SATA
-    storage_port: 1
     vbguest_update: false
     reboot: false
   - # Amazon Linux 2 (Max ansible-core 2.16 (ansible < 10.0.0) on controller since it still supporting Python 2.7)
     box: gbailey/amzn2
     box_url: vagrantup
-    storage_ctl: SATA
-    storage_port: 1
     vbguest_update: false
     reboot: false
   # Testing only supported releases: https://access.redhat.com/support/policy/updates/errata
   - # RHEL 8
     box: generic/rhel8
     box_url: vagrantup
-    storage_ctl: SATA Controller
-    storage_port: 1
     vbguest_update: false
     reboot: true
   - # RHEL 9
     box: generic/rhel9
     box_url: vagrantup
-    storage_ctl: SATA Controller
-    storage_port: 1
     vbguest_update: false
     reboot: true
 
   # Not support by this role
   # - # Oracle Linux 7
   #   box: generic/oracle7
   #   box_url: vagrantup
-  #   storage_ctl: SATA Controller
-  #   storage_port: 1
   #   vbguest_update: false
   #   reboot: false
   # - # Oracle Linux 8
   #   box: generic/oracle8
   #   box_url: vagrantup
-  #   storage_ctl: SATA Controller
-  #   storage_port: 1
   #   vbguest_update: false
   #   reboot: false