From: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Date: Thu, 13 Jun 2019 11:39:17 +0000 (+0200)
Subject: Update 'busybox' and 'haproxy' docker images path in tests
X-Git-Tag: 6.0.0-ONAP~143^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e45ccdc955978a1078e79a823035f4e469274cdf;p=oom%2Foffline-installer.git

Update 'busybox' and 'haproxy' docker images path in tests

At some point names of busybox and haproxy images
have changed in nexus3.onap.org registry. This patch
updates those names in testing framework.

Change-Id: Iaad4976118bfcd708f2b8fccb8df61f6059ac1f4
Issue-ID: OOM-1915
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
---

diff --git a/ansible/test/play-infrastructure/molecule/default/vars.yml b/ansible/test/play-infrastructure/molecule/default/vars.yml
index e91eadb2..6ca5a1ad 100644
--- a/ansible/test/play-infrastructure/molecule/default/vars.yml
+++ b/ansible/test/play-infrastructure/molecule/default/vars.yml
@@ -16,9 +16,9 @@ molecule_test_registry: nexus3.onap.org:10001
 runtime_images:
   busybox:
     registry: "{{ molecule_test_registry }}"
-    path: "/onap/components/busybox"
+    path: "/busybox"
     tag: "latest"
   aaionap-haproxy:
     registry: "{{ molecule_test_registry }}"
-    path: "/onap/components/aaionap/haproxy"
+    path: "/aaionap/haproxy"
     tag: "1.2.4"
diff --git a/ansible/test/roles/prepare-nexus/tasks/main.yml b/ansible/test/roles/prepare-nexus/tasks/main.yml
index 4ef40f5e..5eb1b7d3 100644
--- a/ansible/test/roles/prepare-nexus/tasks/main.yml
+++ b/ansible/test/roles/prepare-nexus/tasks/main.yml
@@ -29,12 +29,12 @@
   docker_image:
     name: busybox
     tag: latest
-    repository: nexus3.onap.org:10001/onap/components/busybox
+    repository: nexus3.onap.org:10001/busybox
 
 - name: Save busybox image
   delegate_to: localhost
   docker_image:
-    name: nexus3.onap.org:10001/onap/components/busybox
+    name: nexus3.onap.org:10001/busybox
     tag: latest
     pull: false
     archive_path: /tmp/busybox.tar
@@ -44,12 +44,12 @@
   docker_image:
     name: aaionap/haproxy
     tag: 1.2.4
-    repository: nexus3.onap.org:10001/onap/components/aaionap/haproxy
+    repository: nexus3.onap.org:10001/aaionap/haproxy
 
 - name: Save haproxy image
   delegate_to: localhost
   docker_image:
-    name: nexus3.onap.org:10001/onap/components/aaionap/haproxy
+    name: nexus3.onap.org:10001/aaionap/haproxy
     tag: 1.2.4
     pull: false
     archive_path: /tmp/haproxy.tar