From 8c343a9738e0596e08a5c7d960f3b558fd3d803b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Wed, 8 Jan 2025 09:51:00 +0100
Subject: [PATCH] Remove packages installed in the server container for
 testsuite

---
 backend_modules/libvirt/host/user_data.yaml |  4 ++++
 salt/server/download_ubuntu_repo.sh         |  8 ++++----
 salt/server/testsuite.sls                   |  2 +-
 salt/server_containerized/testsuite.sls     | 22 ++-------------------
 4 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/backend_modules/libvirt/host/user_data.yaml b/backend_modules/libvirt/host/user_data.yaml
index 0f068c6d5..c8757fea7 100644
--- a/backend_modules/libvirt/host/user_data.yaml
+++ b/backend_modules/libvirt/host/user_data.yaml
@@ -149,6 +149,10 @@ zypper:
       name: tools_pool_repo
 
 runcmd:
+%{ if container_server && testsuite }
+  # Packages needed for the testsuite
+  - "zypper -n in expect"
+%{ endif }
 %{ if install_salt_bundle }
   - "zypper -n in venv-salt-minion avahi nss-mdns"
 %{ else }
diff --git a/salt/server/download_ubuntu_repo.sh b/salt/server/download_ubuntu_repo.sh
index c3bef75f9..bb3650877 100644
--- a/salt/server/download_ubuntu_repo.sh
+++ b/salt/server/download_ubuntu_repo.sh
@@ -2,12 +2,12 @@
 
 set -e
 
-DIR=/srv/www/htdocs/pub/$1
+DIR=$1/htdocs/pub/$2
 mkdir -p $DIR
 cd $DIR
-wget -r -np -A deb,dsc,tar.xz,tar.gz,gz,key,gpg,Packages,Release,Sources http://$2
-mv $2/* .
-HOST=$(echo $2 | awk -F/ '{print $1}')
+wget -r -np -A deb,dsc,tar.xz,tar.gz,gz,key,gpg,Packages,Release,Sources http://$3
+mv $3/* .
+HOST=$(echo $3 | awk -F/ '{print $1}')
 if [ -n "$HOST" -a x"$HOST" != "x/" ]; then
   rm -rf "$HOST"
 fi
diff --git a/salt/server/testsuite.sls b/salt/server/testsuite.sls
index ffc707396..d6e833dce 100644
--- a/salt/server/testsuite.sls
+++ b/salt/server/testsuite.sls
@@ -46,7 +46,7 @@ another_test_repo:
 test_repo_debian_updates:
   cmd.script:
     - name: salt://server/download_ubuntu_repo.sh
-    - args: "TestRepoDebUpdates {{ grains.get('mirror') | default('download.opensuse.org', true) }}/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Updates/deb/"
+    - args: "/srv/www TestRepoDebUpdates {{ grains.get('mirror') | default('download.opensuse.org', true) }}/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Updates/deb/"
     - creates: /srv/www/htdocs/pub/TestRepoDebUpdates/Release
     - require:
       - pkg: testsuite_packages
diff --git a/salt/server_containerized/testsuite.sls b/salt/server_containerized/testsuite.sls
index 8989e2416..119cfa9b9 100644
--- a/salt/server_containerized/testsuite.sls
+++ b/salt/server_containerized/testsuite.sls
@@ -50,20 +50,15 @@ test_repo_debian_updates_script:
     - source: salt://server/download_ubuntu_repo.sh
     - mode: 755
 
-test_repo_debian_updates_script_copy:
-  cmd.run:
-    - name: "mgrctl cp /root/download_ubuntu_repo.sh server:/root/download_ubuntu_repo.sh"
-
 test_repo_debian_updates:
   cmd.run:
-    - name: mgrctl exec /root/download_ubuntu_repo.sh "TestRepoDebUpdates {{ grains.get('mirror') | default('download.opensuse.org', true) }}/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Updates/deb/"
+    - name: /root/download_ubuntu_repo.sh /var/lib/containers/storage/volumes/srv-www/_data TestRepoDebUpdates {{ grains.get('mirror') | default('download.opensuse.org', true) }}/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Updates/deb/
     - unless: mgrctl exec "ls -d /srv/www/htdocs/pub/TestRepoDebUpdates"
     - require:
-      - cmd: test_repo_debian_updates_script_copy
+      - file: test_repo_debian_updates_script
 {% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
       - pkg: uyuni-tools
 {% endif %}
-      - cmd: testsuite_packages
 
 # modify cobbler to be executed from remote-machines..
 cobbler_configuration:
@@ -119,19 +114,6 @@ suse_staging_key_import:
       - file: suse_staging_key_copy_host
 {% endif %}
 
-testsuite_refresh_repos:
-  cmd.run:
-    - name: mgrctl exec "zypper --non-interactive --gpg-auto-import-keys refresh --force; exit 0"
-
-testsuite_packages:
-  cmd.run:
-    - name: mgrctl exec "zypper -n in iputils expect wget OpenIPMI"
-    - require:
-      - cmd: testsuite_refresh_repos
-{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
-      - pkg: uyuni-tools
-{% endif %}
-
 {% set products_to_use_salt_bundle = ["uyuni-master", "uyuni-pr", "head", "5.0-nightly", "5.0-released"] %}
 {% if grains.get('product_version') | default('', true) in products_to_use_salt_bundle %}