From f68a1ba8a382246fcfa55db24db7b7f4864112f2 Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Thu, 7 Nov 2024 17:31:27 -0800
Subject: [PATCH] Fix subversion test on Ubuntu

Also remove obsolete vars files from subversion test.
---
 test/integration/targets/subversion/vars/Debian.yml    | 1 +
 test/integration/targets/subversion/vars/Suse.yml      | 6 ------
 test/integration/targets/subversion/vars/Ubuntu-18.yml | 6 ------
 test/integration/targets/subversion/vars/Ubuntu-20.yml | 8 --------
 4 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 test/integration/targets/subversion/vars/Suse.yml
 delete mode 100644 test/integration/targets/subversion/vars/Ubuntu-18.yml
 delete mode 100644 test/integration/targets/subversion/vars/Ubuntu-20.yml

diff --git a/test/integration/targets/subversion/vars/Debian.yml b/test/integration/targets/subversion/vars/Debian.yml
index dfe131b0e22..493709f6682 100644
--- a/test/integration/targets/subversion/vars/Debian.yml
+++ b/test/integration/targets/subversion/vars/Debian.yml
@@ -1,5 +1,6 @@
 ---
 subversion_packages:
+- apache2
 - subversion
 - libapache2-mod-svn
 apache_user: www-data
diff --git a/test/integration/targets/subversion/vars/Suse.yml b/test/integration/targets/subversion/vars/Suse.yml
deleted file mode 100644
index eab906ec78d..00000000000
--- a/test/integration/targets/subversion/vars/Suse.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-subversion_packages:
-- subversion
-- subversion-server
-apache_user: wwwrun
-apache_group: www
diff --git a/test/integration/targets/subversion/vars/Ubuntu-18.yml b/test/integration/targets/subversion/vars/Ubuntu-18.yml
deleted file mode 100644
index dfe131b0e22..00000000000
--- a/test/integration/targets/subversion/vars/Ubuntu-18.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-subversion_packages:
-- subversion
-- libapache2-mod-svn
-apache_user: www-data
-apache_group: www-data
diff --git a/test/integration/targets/subversion/vars/Ubuntu-20.yml b/test/integration/targets/subversion/vars/Ubuntu-20.yml
deleted file mode 100644
index bfd880fd581..00000000000
--- a/test/integration/targets/subversion/vars/Ubuntu-20.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-subversion_packages:
-- apache2  # /usr/sbin/apachectl
-- apache2-utils  # htpasswd
-- subversion
-- libapache2-mod-svn
-apache_user: www-data
-apache_group: www-data