From dd4106230fb36d2c85f0462a019e178a3fc7826e Mon Sep 17 00:00:00 2001 From: Aaron Hetherington Date: Tue, 2 Apr 2024 09:59:49 +0100 Subject: [PATCH 1/5] Bump python and pip version to 3.11 --- roles/setup/defaults/main.yml | 2 +- roles/setup/vars/RedHat-8.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/setup/defaults/main.yml b/roles/setup/defaults/main.yml index 385607e..f234d8f 100644 --- a/roles/setup/defaults/main.yml +++ b/roles/setup/defaults/main.yml @@ -64,6 +64,6 @@ system_pip_package: python3-pip pip_executable: pip3 python_executable: python3 -minimum_python_version: 3.9 +minimum_python_version: 3.11 receptor_packages: [] diff --git a/roles/setup/vars/RedHat-8.yml b/roles/setup/vars/RedHat-8.yml index db4167f..88de8bd 100644 --- a/roles/setup/vars/RedHat-8.yml +++ b/roles/setup/vars/RedHat-8.yml @@ -1,6 +1,6 @@ -system_pip_package: python39-pip -python_executable: python3.9 -pip_executable: pip3.9 +system_pip_package: python311-pip +python_executable: python3.11 +pip_executable: pip3.11 receptor_packages: - receptor - receptorctl From e8ab2f2a243309bdb63519a6c5bc063b9f777ef4 Mon Sep 17 00:00:00 2001 From: Aaron Hetherington Date: Tue, 2 Apr 2024 13:09:37 +0100 Subject: [PATCH 2/5] Add RedHat-9 vars --- molecule/default/molecule.yml | 10 +++++----- roles/setup/defaults/main.yml | 2 +- roles/setup/vars/RedHat-8.yml | 6 +++--- roles/setup/vars/RedHat-9.yml | 7 +++++++ 4 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 roles/setup/vars/RedHat-9.yml diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 2853d7b..41cf6af 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -12,21 +12,21 @@ platforms: privileged: true command: "/usr/sbin/init" tmpfs: - - /run - - /tmp + "/run": "rw,mode=1777" + "/tmp": "rw,mode=1777" volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro - name: molecule-debian - image: debian:11 + image: debian:12 dockerfile: Containerfile.j2 pre_build_image: false systemd: true privileged: true command: "/lib/systemd/systemd" tmpfs: - - /run - - /tmp + "/run": "rw,mode=1777" + "/tmp": "rw,mode=1777" volumes: - /sys/fs/cgroup:/sys/fs/cgroup:ro diff --git a/roles/setup/defaults/main.yml b/roles/setup/defaults/main.yml index f234d8f..385607e 100644 --- a/roles/setup/defaults/main.yml +++ b/roles/setup/defaults/main.yml @@ -64,6 +64,6 @@ system_pip_package: python3-pip pip_executable: pip3 python_executable: python3 -minimum_python_version: 3.11 +minimum_python_version: 3.9 receptor_packages: [] diff --git a/roles/setup/vars/RedHat-8.yml b/roles/setup/vars/RedHat-8.yml index 88de8bd..db4167f 100644 --- a/roles/setup/vars/RedHat-8.yml +++ b/roles/setup/vars/RedHat-8.yml @@ -1,6 +1,6 @@ -system_pip_package: python311-pip -python_executable: python3.11 -pip_executable: pip3.11 +system_pip_package: python39-pip +python_executable: python3.9 +pip_executable: pip3.9 receptor_packages: - receptor - receptorctl diff --git a/roles/setup/vars/RedHat-9.yml b/roles/setup/vars/RedHat-9.yml new file mode 100644 index 0000000..4457a60 --- /dev/null +++ b/roles/setup/vars/RedHat-9.yml @@ -0,0 +1,7 @@ +system_pip_package: python3.11-pip +python_executable: python3.11 +pip_executable: pip3.11 +receptor_packages: + - receptor + - receptorctl +systemd_folder: "/usr/lib/systemd/system" From 1ee581ccc8f58d789f10032472cac12342a032a0 Mon Sep 17 00:00:00 2001 From: Aaron Hetherington Date: Wed, 3 Apr 2024 12:20:19 +0100 Subject: [PATCH 3/5] Change default pip version to 3.11 --- roles/setup/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/setup/defaults/main.yml b/roles/setup/defaults/main.yml index 385607e..1ca2647 100644 --- a/roles/setup/defaults/main.yml +++ b/roles/setup/defaults/main.yml @@ -59,11 +59,11 @@ additional_system_packages: [] additional_python_packages: [] -system_pip_package: python3-pip +system_pip_package: python3.11-pip pip_executable: pip3 python_executable: python3 -minimum_python_version: 3.9 +minimum_python_version: 3.11 receptor_packages: [] From 32b781b534e466b13fe15d66c0cd7c95eafa1eae Mon Sep 17 00:00:00 2001 From: Aaron Hetherington Date: Wed, 3 Apr 2024 14:20:25 +0100 Subject: [PATCH 4/5] Set min python level per platform type --- roles/setup/defaults/main.yml | 4 ++-- roles/setup/vars/RedHat-8.yml | 1 + roles/setup/vars/RedHat-9.yml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/setup/defaults/main.yml b/roles/setup/defaults/main.yml index 1ca2647..385607e 100644 --- a/roles/setup/defaults/main.yml +++ b/roles/setup/defaults/main.yml @@ -59,11 +59,11 @@ additional_system_packages: [] additional_python_packages: [] -system_pip_package: python3.11-pip +system_pip_package: python3-pip pip_executable: pip3 python_executable: python3 -minimum_python_version: 3.11 +minimum_python_version: 3.9 receptor_packages: [] diff --git a/roles/setup/vars/RedHat-8.yml b/roles/setup/vars/RedHat-8.yml index db4167f..b77cde5 100644 --- a/roles/setup/vars/RedHat-8.yml +++ b/roles/setup/vars/RedHat-8.yml @@ -5,3 +5,4 @@ receptor_packages: - receptor - receptorctl systemd_folder: "/usr/lib/systemd/system" +minimum_python_version: 3.9 diff --git a/roles/setup/vars/RedHat-9.yml b/roles/setup/vars/RedHat-9.yml index 4457a60..b11e3bb 100644 --- a/roles/setup/vars/RedHat-9.yml +++ b/roles/setup/vars/RedHat-9.yml @@ -5,3 +5,4 @@ receptor_packages: - receptor - receptorctl systemd_folder: "/usr/lib/systemd/system" +minimum_python_version: 3.11 From 52592831e29905f0e0bf54aeeb1c0d56bf4becca Mon Sep 17 00:00:00 2001 From: Aaron Hetherington Date: Thu, 4 Apr 2024 09:52:10 +0100 Subject: [PATCH 5/5] Set default min python version to 3.9 --- molecule/default/molecule.yml | 2 +- roles/setup/vars/RedHat-8.yml | 1 - roles/setup/vars/RedHat-9.yml | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 41cf6af..a3145b6 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -18,7 +18,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:ro - name: molecule-debian - image: debian:12 + image: debian:11 dockerfile: Containerfile.j2 pre_build_image: false systemd: true diff --git a/roles/setup/vars/RedHat-8.yml b/roles/setup/vars/RedHat-8.yml index b77cde5..db4167f 100644 --- a/roles/setup/vars/RedHat-8.yml +++ b/roles/setup/vars/RedHat-8.yml @@ -5,4 +5,3 @@ receptor_packages: - receptor - receptorctl systemd_folder: "/usr/lib/systemd/system" -minimum_python_version: 3.9 diff --git a/roles/setup/vars/RedHat-9.yml b/roles/setup/vars/RedHat-9.yml index b11e3bb..4457a60 100644 --- a/roles/setup/vars/RedHat-9.yml +++ b/roles/setup/vars/RedHat-9.yml @@ -5,4 +5,3 @@ receptor_packages: - receptor - receptorctl systemd_folder: "/usr/lib/systemd/system" -minimum_python_version: 3.11