diff options
| author |   Petr Ospalý <p.ospaly@partner.samsung.com> | 2019-06-14 09:07:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-06-14 09:07:08 +0000 |
| commit | 0a16f1267c3bd1c33def62861e6e1726097f239a (patch) | |
| tree | 440bfa34219a52dcb89ab4663d65deb62d87f4df /ansible/test | |
| parent | cf81ff7da21aed314f2dfc74fc6cd04d7354bdf1 (diff) | |
| parent | e45ccdc955978a1078e79a823035f4e469274cdf (diff) | |
Merge changes from topic "OOM-1915"
* changes:
Update 'busybox' and 'haproxy' docker images path in tests
Add role level tests for 'nexus' role
Improve 'nexus' role testability
Diffstat (limited to 'ansible/test')
| -rw-r--r-- | ansible/test/play-infrastructure/molecule/default/vars.yml | 4 | ||||
| -rw-r--r-- | ansible/test/roles/prepare-nexus/tasks/main.yml | 8 |
2 files changed, 6 insertions, 6 deletions
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 |