summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2017-10-18 09:55:13 -0700
committerToshio Kuratomi <a.badger@gmail.com>2017-10-18 14:37:33 -0700
commit3f4005038d6abcb3c7c35b9129750df4e5b03d99 (patch)
tree75cfa8379d8f846a4d1e98612f603b6870600dba
parentd32f138f40a674d0e56792ba36b010330df5eab9 (diff)
downloadansible-3f4005038d6abcb3c7c35b9129750df4e5b03d99.tar.gz
Fix docker_secret integration test dependencies.
(cherry picked from commit eb899c9bcdabb14b6e95f1c9fca0c604967459ab)
-rw-r--r--test/integration/targets/docker_secret/tasks/OpenSuse.yml2
-rw-r--r--test/integration/targets/docker_secret/templates/virt.repo.j26
2 files changed, 4 insertions, 4 deletions
diff --git a/test/integration/targets/docker_secret/tasks/OpenSuse.yml b/test/integration/targets/docker_secret/tasks/OpenSuse.yml
index c00f676aea..cd625d8cf0 100644
--- a/test/integration/targets/docker_secret/tasks/OpenSuse.yml
+++ b/test/integration/targets/docker_secret/tasks/OpenSuse.yml
@@ -5,7 +5,7 @@
- name: Install docker 17
zypper:
- name: docker-17.04.0_ce
+ name: docker>=17
force: yes
disable_gpg_check: yes
update_cache: yes
diff --git a/test/integration/targets/docker_secret/templates/virt.repo.j2 b/test/integration/targets/docker_secret/templates/virt.repo.j2
index 2afd3b0ffd..4d8f380b51 100644
--- a/test/integration/targets/docker_secret/templates/virt.repo.j2
+++ b/test/integration/targets/docker_secret/templates/virt.repo.j2
@@ -1,7 +1,7 @@
[Virtualization_containers]
-name=Virtualization:containers (openSUSE_Tumbleweed)
+name=Virtualization:containers (openSUSE_Leap_{{ ansible_distribution_version }})
type=rpm-md
-baseurl=http://download.opensuse.org/repositories/Virtualization:/containers/openSUSE_Tumbleweed/
+baseurl=http://download.opensuse.org/repositories/Virtualization:/containers/openSUSE_Leap_{{ ansible_distribution_version }}/
gpgcheck=1
-gpgkey=http://download.opensuse.org/repositories/Virtualization:/containers/openSUSE_Tumbleweed//repodata/repomd.xml.key
+gpgkey=http://download.opensuse.org/repositories/Virtualization:/containers/openSUSE_Leap_{{ ansible_distribution_version }}/repodata/repomd.xml.key
enabled=1