summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Borean <jborean93@gmail.com>2019-02-08 06:18:08 +1000
committerToshio Kuratomi <a.badger@gmail.com>2019-02-07 13:54:22 -0800
commitad71a9a7edebb2eb6866ca158ae57a8d0d68ca21 (patch)
treecb88bfdb4f144e3bbc5fb7dbd2988ae7c5e06c2d
parentac3a3ce599fa8e2eb9ac6cf06e2d06f94d841a73 (diff)
downloadansible-ad71a9a7edebb2eb6866ca158ae57a8d0d68ca21.tar.gz
Get docker tests working on OpenSUSE (#51896)
(cherry picked from commit c92fcf0b570fac228eaa89c4a8114b354b4addad)
-rw-r--r--test/integration/targets/setup_docker/tasks/Suse.yml5
-rw-r--r--test/integration/targets/setup_docker/templates/virt.repo.j27
2 files changed, 0 insertions, 12 deletions
diff --git a/test/integration/targets/setup_docker/tasks/Suse.yml b/test/integration/targets/setup_docker/tasks/Suse.yml
index cd625d8cf0..3bd3d1dad1 100644
--- a/test/integration/targets/setup_docker/tasks/Suse.yml
+++ b/test/integration/targets/setup_docker/tasks/Suse.yml
@@ -1,8 +1,3 @@
-- name: Template repo
- template:
- src: virt.repo.j2
- dest: /etc/zypp/repos.d/virt.repo
-
- name: Install docker 17
zypper:
name: docker>=17
diff --git a/test/integration/targets/setup_docker/templates/virt.repo.j2 b/test/integration/targets/setup_docker/templates/virt.repo.j2
deleted file mode 100644
index 4d8f380b51..0000000000
--- a/test/integration/targets/setup_docker/templates/virt.repo.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-[Virtualization_containers]
-name=Virtualization:containers (openSUSE_Leap_{{ ansible_distribution_version }})
-type=rpm-md
-baseurl=http://download.opensuse.org/repositories/Virtualization:/containers/openSUSE_Leap_{{ ansible_distribution_version }}/
-gpgcheck=1
-gpgkey=http://download.opensuse.org/repositories/Virtualization:/containers/openSUSE_Leap_{{ ansible_distribution_version }}/repodata/repomd.xml.key
-enabled=1