summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2019-01-18 16:07:17 -0800
committerMatt Clay <matt@mystile.com>2019-01-18 16:24:47 -0800
commitb2067295af92c2e0bea9ba4c3c45c55361089821 (patch)
tree7a67501997512a36f55d5a343b911fd0e2b673c2
parent251bdc73ae328ae966ff3782bc4e1dc14d80f746 (diff)
downloadansible-b2067295af92c2e0bea9ba4c3c45c55361089821.tar.gz
[stable-2.5] Fix subversion integration test on Fedora 29. (#51089)
* Fix subversion integration test on Fedora 29. This upgrades the sqlite-libs and subversion packages to make sure that the version of sqlite expected by subversion is installed. * Fix compatibility with RHEL and CentOS. (cherry picked from commit d4dbc7f2e0d963e37e371f3b505152c2e11f1ca6) Co-authored-by: Matt Clay <matt@mystile.com>
-rw-r--r--test/integration/targets/subversion/tasks/setup.yml7
-rw-r--r--test/integration/targets/subversion/vars/RedHat.yml4
2 files changed, 11 insertions, 0 deletions
diff --git a/test/integration/targets/subversion/tasks/setup.yml b/test/integration/targets/subversion/tasks/setup.yml
index 77331bd126..5f617b73a8 100644
--- a/test/integration/targets/subversion/tasks/setup.yml
+++ b/test/integration/targets/subversion/tasks/setup.yml
@@ -7,6 +7,13 @@
name: '{{ subversion_packages }}'
state: present
+- name: upgrade SVN pre-reqs
+ package:
+ name: '{{ upgrade_packages }}'
+ state: latest
+ when:
+ - upgrade_packages | default([])
+
- name: create SVN home folder
file:
path: '{{ subversion_server_dir }}'
diff --git a/test/integration/targets/subversion/vars/RedHat.yml b/test/integration/targets/subversion/vars/RedHat.yml
index 666d229cd9..3e3f910938 100644
--- a/test/integration/targets/subversion/vars/RedHat.yml
+++ b/test/integration/targets/subversion/vars/RedHat.yml
@@ -2,5 +2,9 @@
subversion_packages:
- mod_dav_svn
- subversion
+upgrade_packages:
+# prevent sqlite from being out-of-sync with the version subversion was compiled with
+- subversion
+- sqlite
apache_user: apache
apache_group: apache