From 7331b24d329220831420c1e0fec7181e5c66b5f3 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 11:05:22 +0200
Subject: [PATCH 01/16] os_facts instead of setup

---
 Ansible/roles/marvin/tasks/main.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Ansible/roles/marvin/tasks/main.yml b/Ansible/roles/marvin/tasks/main.yml
index 3dd1275305..623502ad2e 100644
--- a/Ansible/roles/marvin/tasks/main.yml
+++ b/Ansible/roles/marvin/tasks/main.yml
@@ -13,9 +13,7 @@
     - kvm
 
 - name: Now I'm connected, get facts
-  setup:
-  tags:
-    - kvm
+  os_facts:
 
 - include: ../../../tasks/set_centos_repos.yml
 

From ec14d6c93bf8856001b72ed30992856fdbe12747 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 11:10:19 +0200
Subject: [PATCH 02/16] do not include base repos

---
 Ansible/roles/marvin/tasks/main.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Ansible/roles/marvin/tasks/main.yml b/Ansible/roles/marvin/tasks/main.yml
index 623502ad2e..268410015d 100644
--- a/Ansible/roles/marvin/tasks/main.yml
+++ b/Ansible/roles/marvin/tasks/main.yml
@@ -15,8 +15,6 @@
 - name: Now I'm connected, get facts
   os_facts:
 
-- include: ../../../tasks/set_centos_repos.yml
-
 - name: Ensure selinux python bindings are installed
   yum: name=libselinux-python state=present
 

From 1edb7a0ba833daa8a239bbdfbb57c2ac792285a0 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 11:19:42 +0200
Subject: [PATCH 03/16] remove p2 and selinux adjust

---
 Ansible/roles/marvin/tasks/main.yml | 39 +++++------------------------
 1 file changed, 6 insertions(+), 33 deletions(-)

diff --git a/Ansible/roles/marvin/tasks/main.yml b/Ansible/roles/marvin/tasks/main.yml
index 268410015d..51caaaedc5 100644
--- a/Ansible/roles/marvin/tasks/main.yml
+++ b/Ansible/roles/marvin/tasks/main.yml
@@ -15,11 +15,8 @@
 - name: Now I'm connected, get facts
   os_facts:
 
-- name: Ensure selinux python bindings are installed
-  yum: name=libselinux-python state=present
-
 - name: Ensure selinux python3 bindings are installed
-  yum: name=libselinux-python3 state=present
+  yum: name=python3-libselinux state=present
 
 - name: Put SELinux in permissive mode, logging actions that would be blocked.
   selinux:
@@ -76,20 +73,8 @@
     - marvin
     - marvin_cfg
 
-- name: Install wheel
-  pip:
-    name: wheel
-  tags:
-    - marvin
-
-- name: Install nose
-  pip:
-    name: nose
-  tags:
-    - marvin
-
 - name: Check if marvin is installed in python3
-  stat: path=/usr/local/lib/python3.6/site-packages/marvin/
+  stat: path=/usr/lib/python3.9/site-packages/marvin/
   register: marvin3
 
 - name: install marvin in python3 if not exist
@@ -152,10 +137,8 @@
 - name: remove orginal test_data files
   file: path="{{ item }}" state=absent
   with_items:
-    - "/usr/lib/python2.7/site-packages/marvin/config/test_data.pyc"
-    - "/usr/lib/python2.7/site-packages/marvin/config/test_data.py"
-    - "/usr/local/lib/python3.6/site-packages/marvin/config/test_data.pyc"
-    - "/usr/local/lib/python3.6/site-packages/marvin/config/test_data.py"
+    - "/usr/lib/python3.9/site-packages/marvin/config/test_data.pyc"
+    - "/usr/lib/python3.9/site-packages/marvin/config/test_data.py"
   tags:
     - marvin
     - marvin_cfg
@@ -166,23 +149,13 @@
     - marvin
     - marvin_cfg
 
-- name: Check if marvin is installed in python2
-  stat: path=/usr/lib/python2.7/site-packages/marvin/
-  register: marvin2
-
-- name: create symlink to test_data.py
-  file: src=/marvin/test_data.py dest=/usr/lib/python2.7/site-packages/marvin/config/test_data.py state=link mode=0644
-  when: marvin2.stat.exists == true
-  tags:
-    - marvin
-    - marvin_cfg
 
 - name: Check if marvin is installed in python3
-  stat: path=/usr/local/lib/python3.6/site-packages/marvin/
+  stat: path=/usr/lib/python3.9/site-packages/marvin/
   register: marvin3
 
 - name: create python3 symlink to test_data.py
-  file: src=/marvin/test_data.py dest=/usr/local/lib/python3.6/site-packages/marvin/config/test_data.py state=link mode=0644
+  file: src=/marvin/test_data.py dest=/usr/lib/python3.9/site-packages/marvin/config/test_data.py state=link mode=0644
   when: marvin3.stat.exists == true
   tags:
     - marvin

From 6317d0bc2316034a156b9e7e01eeba99621d817c Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 11:29:37 +0200
Subject: [PATCH 04/16] remove p2 from prereqs

---
 .../roles/marvin/tasks/install_marvin_prereqs.yml    | 12 ++++--------
 Ansible/roles/marvin/tasks/main.yml                  |  7 +++++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
index 155ac7ac2b..ece88ccff4 100644
--- a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
+++ b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
@@ -28,20 +28,16 @@
     - marvin_cfg
     - marvin_install
 
-- include: ../../../tasks/set_centos_repos.yml
-  tags:
-    - marvin
-    - marvin_install
 
 - name: Install Dev Tools Group
-  yum: name="@Development tools" state=installed update_cache=yes
+  dnf: name="@Development tools" state=installed update_cache=yes
   tags:
     - marvin
     - marvin_cfg
     - marvin_install
 
 - name: Install other dependancies
-  yum: name={{ item }} state=installed update_cache=yes
+  dnf: name={{ item }} state=installed update_cache=yes
   with_items:
   - 'http://dev.mysql.com/get/mysql57-community-release-el7-7.noarch.rpm'
   - zlib-devel
@@ -77,7 +73,7 @@
     - marvin_install
 
 - name: remove yum openSSL package
-  yum:
+  dnf:
     name: pyOpenSSL
     state: absent
 
@@ -136,7 +132,7 @@
   command: yum clean all
 
 - name: Ensure CA-Certificates are up to date
-  yum:
+  dnf:
     name: ca-certificates
     state: latest
   tags:
diff --git a/Ansible/roles/marvin/tasks/main.yml b/Ansible/roles/marvin/tasks/main.yml
index 51caaaedc5..758d825d79 100644
--- a/Ansible/roles/marvin/tasks/main.yml
+++ b/Ansible/roles/marvin/tasks/main.yml
@@ -16,7 +16,10 @@
   os_facts:
 
 - name: Ensure selinux python3 bindings are installed
-  yum: name=python3-libselinux state=present
+  dnf: name=python3-libselinux state=present
+
+- name: Ensure sshpass is installed
+  dnf: name=sshpass state=present
 
 - name: Put SELinux in permissive mode, logging actions that would be blocked.
   selinux:
@@ -68,7 +71,7 @@
     - marvin_cfg
 
 - name: Ensure integration test packages are installed
-  yum: name=cloudstack-integration-tests state=present
+  dnf: name=cloudstack-integration-tests state=present
   tags:
     - marvin
     - marvin_cfg

From 7856a3956d42d3cd928e7e70d4311cd75913440d Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 11:53:36 +0200
Subject: [PATCH 05/16] remove more python2 stuff

---
 .../marvin/tasks/install_marvin_prereqs.yml   | 27 -------------------
 Ansible/roles/marvin/tasks/main.yml           |  2 +-
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
index ece88ccff4..e2072013f3 100644
--- a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
+++ b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
@@ -52,7 +52,6 @@
   - python-pip
   - python3-devel
   - python3-pip
-  - mysql-devel
   - zlib-devel
   - bzip2-devel
   - openssl-devel
@@ -77,32 +76,6 @@
     name: pyOpenSSL
     state: absent
 
-- name: Update pip and components
-  pip:
-    name: "{{ item }}"
-    extra_args: '--trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org --upgrade'
-  with_items:
-  - pip==20.2.1
-  - six
-  - pyOpenSSL
-  - wheel==0.34.2
-  - '"requests[security]"'
-  - pyasn1
-  - wget
-  - texttable
-  - lxml
-  - paramiko
-  - setuptools
-  - pyvmomi==8.0.0.1
-  tags:
-    - marvin
-    - marvin_install
-
-- name: Workaround for pip install kubernetes
-  pip:
-    name: "kubernetes"
-    extra_args: '--ignore-installed'
-
 - name: Update pip3 and components
   pip:
     name: "{{ item }}"
diff --git a/Ansible/roles/marvin/tasks/main.yml b/Ansible/roles/marvin/tasks/main.yml
index 758d825d79..176d0cf141 100644
--- a/Ansible/roles/marvin/tasks/main.yml
+++ b/Ansible/roles/marvin/tasks/main.yml
@@ -65,7 +65,7 @@
   when: ("{{ mypackage_available }}" == "false") or (force_marvin_fallback)
 
 - name: Install Marvin package
-  yum: name=cloudstack-marvin state=present
+  dnf: name=cloudstack-marvin state=present
   tags:
     - marvin
     - marvin_cfg

From 9eae9f44c38792614c841ad86ed0e70712471c2b Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 11:55:37 +0200
Subject: [PATCH 06/16] no update cache with dnf

---
 Ansible/roles/marvin/tasks/install_marvin_prereqs.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
index e2072013f3..175ac10932 100644
--- a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
+++ b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
@@ -30,14 +30,14 @@
 
 
 - name: Install Dev Tools Group
-  dnf: name="@Development tools" state=installed update_cache=yes
+  dnf: name="@Development tools" state=installed
   tags:
     - marvin
     - marvin_cfg
     - marvin_install
 
 - name: Install other dependancies
-  dnf: name={{ item }} state=installed update_cache=yes
+  dnf: name={{ item }} state=installed
   with_items:
   - 'http://dev.mysql.com/get/mysql57-community-release-el7-7.noarch.rpm'
   - zlib-devel

From af139e80f62afd39409f9238fdf5c3cd57b056df Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 12:06:43 +0200
Subject: [PATCH 07/16] more removals

---
 Ansible/roles/marvin/tasks/install_marvin_prereqs.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
index 175ac10932..f4099947b5 100644
--- a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
+++ b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
@@ -52,6 +52,7 @@
   - python-pip
   - python3-devel
   - python3-pip
+  - python3-requests
   - zlib-devel
   - bzip2-devel
   - openssl-devel
@@ -87,13 +88,11 @@
   - pyOpenSSL
   - wheel==0.34.2
   - kubernetes
-  - '"requests[security]"'
   - pyasn1
   - wget
   - texttable
   - lxml
   - pycparser==2.13
-  - paramiko
   - mysql-connector-python==8.0.29
   - netaddr==0.10.1
   - pyvmomi==8.0.3.0.1

From 7267bea986045a8be31ea59fd510b351ebc266f2 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 12:17:05 +0200
Subject: [PATCH 08/16] service -> systemd

---
 Ansible/roles/marvin/tasks/install_marvin_prereqs.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
index f4099947b5..0b459f54d2 100644
--- a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
+++ b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
@@ -112,4 +112,7 @@
     - marvin_install
 
 - name: ensure atd is running to schedule jobs
-  service: name=atd state=started enabled=yes
+  systemd:
+    name=atd
+    state=started
+    enabled=true

From 45700a1ee12d44c1caa6c57941c6684e5410028d Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 12:20:30 +0200
Subject: [PATCH 09/16] service -> systemd (syntax error)

---
 Ansible/roles/marvin/tasks/install_marvin_prereqs.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
index 0b459f54d2..79084bce55 100644
--- a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
+++ b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
@@ -113,6 +113,6 @@
 
 - name: ensure atd is running to schedule jobs
   systemd:
-    name=atd
-    state=started
-    enabled=true
+    name: atd
+    state: started
+    enabled: true

From f8f93da672f8c0302eba6d6cd0eb6da3abcfbf38 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 14:06:51 +0200
Subject: [PATCH 10/16] cleanup

---
 .../marvin/tasks/install_marvin_prereqs.yml   | 20 +++++++++++--------
 Ansible/roles/marvin/tasks/main.yml           | 13 +++---------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
index 79084bce55..a1b5bce34d 100644
--- a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
+++ b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
@@ -74,8 +74,11 @@
 
 - name: remove yum openSSL package
   dnf:
-    name: pyOpenSSL
+    name: "{{ item }}"
     state: absent
+  with_items:
+  - pyOpenSSL
+  - python3-paramiko
 
 - name: Update pip3 and components
   pip:
@@ -83,25 +86,26 @@
     executable: pip3
     extra_args: '--upgrade'
   with_items:
-  - pip==21.3.1
+  - pip
   - six
   - pyOpenSSL
-  - wheel==0.34.2
+  - paramiko
+  - wheel
   - kubernetes
   - pyasn1
   - wget
   - texttable
   - lxml
-  - pycparser==2.13
-  - mysql-connector-python==8.0.29
-  - netaddr==0.10.1
-  - pyvmomi==8.0.3.0.1
+  - pycparser
+  - mysql-connector-python==8.0.30
+  - netaddr
+  - pyvmomi
   tags:
     - marvin
     - marvin_install
 
 - name: Clear all yum cache
-  command: yum clean all
+  command: dnf clean all
 
 - name: Ensure CA-Certificates are up to date
   dnf:
diff --git a/Ansible/roles/marvin/tasks/main.yml b/Ansible/roles/marvin/tasks/main.yml
index 176d0cf141..1e2dee6073 100644
--- a/Ansible/roles/marvin/tasks/main.yml
+++ b/Ansible/roles/marvin/tasks/main.yml
@@ -15,6 +15,9 @@
 - name: Now I'm connected, get facts
   os_facts:
 
+- name: Set hostname pt2
+  shell: "hostnamectl set-hostname {{ inventory_hostname }}"
+
 - name: Ensure selinux python3 bindings are installed
   dnf: name=python3-libselinux state=present
 
@@ -32,16 +35,6 @@
 - name: sync time with mgmt server
   shell: date --set=`sshpass -p 'P@ssword123' ssh -o StrictHostKeyChecking=no root@{{ hostvars[groups['primary_cs_manager'][0]]['ansible_ssh_host'] }} 'date --iso-8601=seconds'`
 
-- name: restart machine for clean time application
-  command: sleep 2 && /sbin/shutdown -r now "set time"
-  async: 1
-  poll: 0
-  ignore_errors: true
-
-- name: waiting 60 secs for server to come back
-  become: false
-  local_action: wait_for host={{ ansible_ssh_host }} port=22 state=started delay=60 timeout=300
-
 - include: ./install_marvin_prereqs.yml
 
 - name: Set repo to install PR tests from

From 17be4738f05be0dffc637e681197c026a4263009 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 14:58:49 +0200
Subject: [PATCH 11/16] small-fixes

---
 Ansible/roles/marvin/templates/componenttests.sh.j2 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Ansible/roles/marvin/templates/componenttests.sh.j2 b/Ansible/roles/marvin/templates/componenttests.sh.j2
index 47515bd01f..8d3b95d0f6 100644
--- a/Ansible/roles/marvin/templates/componenttests.sh.j2
+++ b/Ansible/roles/marvin/templates/componenttests.sh.j2
@@ -18,7 +18,7 @@ set +e # stop erroneous failures reported by Jenkins
 TESTTYPE="Component tests"
 LOGDIR=/marvin/MarvinLogs
 TESTDIR="/marvin/tests/component"
-SUMMARY_FILE=/marvin/componenttest-summary.txt
+SUMMARY_FILE=/marvin/componenttests-summary.txt
 TMP_JSON_DIR="/marvin/json_results/"
 CLEAN_UP_LOG="/marvin/cleanup.log"
 mkdir -p $LOGDIR
@@ -74,7 +74,8 @@ for file in $FILES; do
   {% if use_hipchat %}
     hipchat --action sendNotification --room "Marvin Notifications" --messageFormat "html" --colour "gray" --message "Starting <b>$(basename $file)</b> on {{ hostvars[groups['marvin_host'][0]]['ansible_ssh_host'] }} in: <br><b>{{ env_name_clean }}</b> - test ($counter of $NUMTESTS)"
   {% endif %}
-  {% if use_slack %}    slackmsg "Starting $TESTFILENAME on {{ hostvars[groups['marvin_host'][0]]['ansible_ssh_host'] }}.\nTest ($counter of $NUMTESTS) " "#808080"
+  {% if use_slack %}
+    slackmsg "Starting $TESTFILENAME on {{ hostvars[groups['marvin_host'][0]]['ansible_ssh_host'] }}.\nTest ($counter of $NUMTESTS) " "#808080"
   {% endif %}
   start_time="$(date -u +%s)"
   launchtest $file

From 88320bdc9a9d39d1bb4616a67c8c96107a016c43 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 15:26:48 +0200
Subject: [PATCH 12/16] cleanup

---
 .../marvin/tasks/install_marvin_prereqs.yml   |  6 -----
 Ansible/roles/marvin/tasks/main.yml           | 24 -------------------
 2 files changed, 30 deletions(-)

diff --git a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
index a1b5bce34d..08f2ac45fc 100644
--- a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
+++ b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
@@ -39,7 +39,6 @@
 - name: Install other dependancies
   dnf: name={{ item }} state=installed
   with_items:
-  - 'http://dev.mysql.com/get/mysql57-community-release-el7-7.noarch.rpm'
   - zlib-devel
   - bzip2-devel
   - openssl-devel
@@ -47,12 +46,8 @@
   - wget
   - sqlite
   - sqlite-devel
-  - python-paramiko
-  - python-devel
-  - python-pip
   - python3-devel
   - python3-pip
-  - python3-requests
   - zlib-devel
   - bzip2-devel
   - openssl-devel
@@ -78,7 +73,6 @@
     state: absent
   with_items:
   - pyOpenSSL
-  - python3-paramiko
 
 - name: Update pip3 and components
   pip:
diff --git a/Ansible/roles/marvin/tasks/main.yml b/Ansible/roles/marvin/tasks/main.yml
index 1e2dee6073..03a8db4128 100644
--- a/Ansible/roles/marvin/tasks/main.yml
+++ b/Ansible/roles/marvin/tasks/main.yml
@@ -69,17 +69,6 @@
     - marvin
     - marvin_cfg
 
-- name: Check if marvin is installed in python3
-  stat: path=/usr/lib/python3.9/site-packages/marvin/
-  register: marvin3
-
-- name: install marvin in python3 if not exist
-  shell: "pip3 install /usr/share/cloudstack-marvin/Marvin-*.tar.gz"
-  when: marvin3.stat.exists == false
-  tags:
-    - marvin
-    - marvin_cfg
-
 - name: retrieve environment data
   env_db_manage: DBHOST={{ env_db_ip }} DBUSER={{ env_db_user }} DBPASS={{ env_db_password }} DBNAME={{ env_db_name }} ENV_UUID={{ env_uuid }} ENV_NAME={{ env_name_clean }} ENV_ZONETYPE={{ env_zonetype }} ENV_SECGROUPS={{ env_zone_secgroups }} ENV_ACTION=retrieve
   tags:
@@ -157,19 +146,6 @@
     - marvin
     - marvin_cfg
 
-# Install specific version of mysql-connector-python for compatibility with MariaDB
-# For more details: https://stackoverflow.com/a/73254598/3428543
-- name: Install mysql-connector-python==8.0.29
-  pip:
-    name: "{{ item }}"
-    executable: pip3
-    extra_args: '--upgrade'
-  with_items:
-  - mysql-connector-python==8.0.29
-  tags:
-    - marvin
-    - marvin_install
-
 - name: create common functions file
   template: src="common_functions.sh.j2" dest="/marvin/common_functions.sh" mode=0755
   tags:

From 6521da06290954ea83f3f4428d9a8925e007b41f Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 16:02:16 +0200
Subject: [PATCH 13/16] generalise the package site dir

---
 Ansible/roles/marvin/tasks/main.yml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/Ansible/roles/marvin/tasks/main.yml b/Ansible/roles/marvin/tasks/main.yml
index 03a8db4128..f63031f25a 100644
--- a/Ansible/roles/marvin/tasks/main.yml
+++ b/Ansible/roles/marvin/tasks/main.yml
@@ -119,11 +119,20 @@
     - marvin
     - marvin_cfg
 
+- name get site packages location
+  shell: pip show requests | awk '/^Location:/{print $2}'
+  register:
+    package_dir
+
+- name: Check if marvin is installed in python3
+  stat: path={{ package_dir.stdout }}/marvin/
+  register: marvin3
+
 - name: remove orginal test_data files
   file: path="{{ item }}" state=absent
   with_items:
-    - "/usr/lib/python3.9/site-packages/marvin/config/test_data.pyc"
-    - "/usr/lib/python3.9/site-packages/marvin/config/test_data.py"
+    - "{{ marvin3 }}/config/test_data.pyc"
+    - "{{ marvin3 }}/config/test_data.py"
   tags:
     - marvin
     - marvin_cfg
@@ -134,13 +143,8 @@
     - marvin
     - marvin_cfg
 
-
-- name: Check if marvin is installed in python3
-  stat: path=/usr/lib/python3.9/site-packages/marvin/
-  register: marvin3
-
 - name: create python3 symlink to test_data.py
-  file: src=/marvin/test_data.py dest=/usr/lib/python3.9/site-packages/marvin/config/test_data.py state=link mode=0644
+  file: src=/marvin/test_data.py dest={{ marvin3 }}/config/test_data.py state=link mode=0644
   when: marvin3.stat.exists == true
   tags:
     - marvin

From a144c8430421843aaa160c723d51da9cde211b45 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 16:07:26 +0200
Subject: [PATCH 14/16] syntax

---
 Ansible/roles/marvin/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Ansible/roles/marvin/tasks/main.yml b/Ansible/roles/marvin/tasks/main.yml
index f63031f25a..3b29f7b258 100644
--- a/Ansible/roles/marvin/tasks/main.yml
+++ b/Ansible/roles/marvin/tasks/main.yml
@@ -119,7 +119,7 @@
     - marvin
     - marvin_cfg
 
-- name get site packages location
+- name: get site packages location
   shell: pip show requests | awk '/^Location:/{print $2}'
   register:
     package_dir

From b891ebf68e7a40cf13df39cc53bd17dab60e0c0a Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 16:18:26 +0200
Subject: [PATCH 15/16] wrong var

---
 Ansible/roles/marvin/tasks/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Ansible/roles/marvin/tasks/main.yml b/Ansible/roles/marvin/tasks/main.yml
index 3b29f7b258..3964d7e177 100644
--- a/Ansible/roles/marvin/tasks/main.yml
+++ b/Ansible/roles/marvin/tasks/main.yml
@@ -131,8 +131,8 @@
 - name: remove orginal test_data files
   file: path="{{ item }}" state=absent
   with_items:
-    - "{{ marvin3 }}/config/test_data.pyc"
-    - "{{ marvin3 }}/config/test_data.py"
+    - "{{ package_dir.stdout }}/marvin/config/test_data.pyc"
+    - "{{ package_dir.stdout }}/marvin/config/test_data.py"
   tags:
     - marvin
     - marvin_cfg
@@ -144,7 +144,7 @@
     - marvin_cfg
 
 - name: create python3 symlink to test_data.py
-  file: src=/marvin/test_data.py dest={{ marvin3 }}/config/test_data.py state=link mode=0644
+  file: src=/marvin/test_data.py dest={{ package_dir.stdout }}/marvin/config/test_data.py state=link mode=0644
   when: marvin3.stat.exists == true
   tags:
     - marvin

From 9d00700af9a956fd595965e9764542dd064c720c Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Fri, 27 Jun 2025 16:20:22 +0200
Subject: [PATCH 16/16] deinstall rmp base py packs

---
 Ansible/roles/marvin/tasks/install_marvin_prereqs.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
index 08f2ac45fc..9fd11ca4cd 100644
--- a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
+++ b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml
@@ -72,7 +72,10 @@
     name: "{{ item }}"
     state: absent
   with_items:
-  - pyOpenSSL
+  - python3-pyOpenSSL
+  - python3-six
+  - python3-urllib3
+  - python3-requests
 
 - name: Update pip3 and components
   pip: