[MOLECULE 3.3.0] Drop scenario name in molecule.yml

In Molecule 3.x.x it's no longer needed, scenario name is assumed
from its directory name.

Ref.: https://github.com/ansible-community/molecule/issues/2560

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

diff --git a/ansible/roles/application/molecule/custom_role/molecule.yml b/ansible/roles/application/molecule/custom_role/molecule.yml
index 733ad18..64ebe3d 100644 (file)
--- a/ansible/roles/application/molecule/custom_role/molecule.yml
+++ b/ansible/roles/application/molecule/custom_role/molecule.yml
@@ -38,7 +38,6 @@ provisioner:
     converge: ../default/converge.yml
     cleanup: ../default/cleanup.yml
 scenario:
-  name: custom_role
   test_sequence:
     - lint
     - cleanup

diff --git a/ansible/roles/application/molecule/default/molecule.yml b/ansible/roles/application/molecule/default/molecule.yml
index e516f0f..53c5b15 100644 (file)
--- a/ansible/roles/application/molecule/default/molecule.yml
+++ b/ansible/roles/application/molecule/default/molecule.yml
@@ -32,7 +32,6 @@ provisioner:
         app_helm_chart_name: "{{ app_name }}"
         helm_version: v2
 scenario:
-  name: default
   test_sequence:
     - lint
     - cleanup

diff --git a/ansible/roles/application/molecule/helm3/molecule.yml b/ansible/roles/application/molecule/helm3/molecule.yml
index 8ca5fca..aff7a24 100644 (file)
--- a/ansible/roles/application/molecule/helm3/molecule.yml
+++ b/ansible/roles/application/molecule/helm3/molecule.yml
@@ -36,7 +36,6 @@ provisioner:
     converge: ../default/converge.yml
     cleanup: ../default/cleanup.yml
 scenario:
-  name: helm3
   test_sequence:
     - lint
     - cleanup

diff --git a/ansible/roles/application/molecule/ubuntu/molecule.yml b/ansible/roles/application/molecule/ubuntu/molecule.yml
index 4252338..0d5049a 100644 (file)
--- a/ansible/roles/application/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/application/molecule/ubuntu/molecule.yml
@@ -37,7 +37,6 @@ provisioner:
     converge: ../default/converge.yml
     cleanup: ../default/cleanup.yml
 scenario:
-  name: ubuntu
   test_sequence:
     - lint
     - cleanup

diff --git a/ansible/roles/certificates/molecule/default/molecule.yml b/ansible/roles/certificates/molecule/default/molecule.yml
index 4751dbd..fd703ca 100644 (file)
--- a/ansible/roles/certificates/molecule/default/molecule.yml
+++ b/ansible/roles/certificates/molecule/default/molecule.yml
@@ -34,7 +34,6 @@ provisioner:
     links:
       group_vars: ../../../../group_vars/
 scenario:
-  name: default
   test_sequence:
     - lint
     - cleanup

diff --git a/ansible/roles/certificates/molecule/ubuntu/molecule.yml b/ansible/roles/certificates/molecule/ubuntu/molecule.yml
index aa51990..c2854e3 100644 (file)
--- a/ansible/roles/certificates/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/certificates/molecule/ubuntu/molecule.yml
@@ -35,7 +35,6 @@ provisioner:
     links:
       group_vars: ../../../../group_vars/
 scenario:
-  name: ubuntu
   test_sequence:
     - lint
     - cleanup

diff --git a/ansible/roles/chartmuseum/molecule/default/molecule.yml b/ansible/roles/chartmuseum/molecule/default/molecule.yml
index 5c9dce7..2b64ce9 100644 (file)
--- a/ansible/roles/chartmuseum/molecule/default/molecule.yml
+++ b/ansible/roles/chartmuseum/molecule/default/molecule.yml
@@ -26,7 +26,5 @@ provisioner:
   inventory:
     links:
       group_vars: ../../../../group_vars
-scenario:
-  name: default
 verifier:
   name: testinfra

diff --git a/ansible/roles/chartmuseum/molecule/ubuntu/molecule.yml b/ansible/roles/chartmuseum/molecule/ubuntu/molecule.yml
index 8b50ec5..1165bd1 100644 (file)
--- a/ansible/roles/chartmuseum/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/chartmuseum/molecule/ubuntu/molecule.yml
@@ -29,8 +29,6 @@ provisioner:
   playbooks:
     prepare: ../default/prepare.yml
     converge: ../default/converge.yml
-scenario:
-  name: ubuntu
 verifier:
   name: testinfra
   directory: ../default/tests/

diff --git a/ansible/roles/dns/molecule/ubuntu/molecule.yml b/ansible/roles/dns/molecule/ubuntu/molecule.yml
index ae763c2..191da95 100644 (file)
--- a/ansible/roles/dns/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/dns/molecule/ubuntu/molecule.yml
@@ -35,7 +35,5 @@ provisioner:
       all:
         app_name: onap
         app_data_path: "/opt/{{ app_name }}"
-scenario:
-  name: ubuntu
 verifier:
   name: testinfra

diff --git a/ansible/roles/docker/molecule/default/molecule.yml b/ansible/roles/docker/molecule/default/molecule.yml
index 031aa5f..10ce1f4 100644 (file)
--- a/ansible/roles/docker/molecule/default/molecule.yml
+++ b/ansible/roles/docker/molecule/default/molecule.yml
@@ -30,8 +30,6 @@ provisioner:
     host_vars:
       infrastructure-server:
         cluster_ip: 1.2.3.4
-scenario:
-  name: default
 verifier:
   name: testinfra
   options:

diff --git a/ansible/roles/docker/molecule/ubuntu/molecule.yml b/ansible/roles/docker/molecule/ubuntu/molecule.yml
index a4705a1..5abaef5 100644 (file)
--- a/ansible/roles/docker/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/docker/molecule/ubuntu/molecule.yml
@@ -34,8 +34,6 @@ provisioner:
       infrastructure-server:
         cluster_ip: 1.2.3.4
         remote_tmp: $HOME/.ansible/tmp
-scenario:
-  name: ubuntu
 verifier:
   name: testinfra
   options:

diff --git a/ansible/roles/helm/molecule/default/molecule.yml b/ansible/roles/helm/molecule/default/molecule.yml
index b20e2a1..aa9bd19 100644 (file)
--- a/ansible/roles/helm/molecule/default/molecule.yml
+++ b/ansible/roles/helm/molecule/default/molecule.yml
@@ -23,7 +23,5 @@ provisioner:
       all:
         app_name: onap
         app_data_path: "/opt/{{ app_name }}"
-scenario:
-  name: default
 verifier:
   name: testinfra

diff --git a/ansible/roles/helm/molecule/helm3/molecule.yml b/ansible/roles/helm/molecule/helm3/molecule.yml
index 4b582f5..e2f7e81 100644 (file)
--- a/ansible/roles/helm/molecule/helm3/molecule.yml
+++ b/ansible/roles/helm/molecule/helm3/molecule.yml
@@ -23,8 +23,6 @@ provisioner:
       all:
         app_name: onap
         app_data_path: "/opt/{{ app_name }}"
-scenario:
-  name: helm3
 verifier:
   name: testinfra
   directory: ../default/tests

diff --git a/ansible/roles/helm/molecule/ubuntu/molecule.yml b/ansible/roles/helm/molecule/ubuntu/molecule.yml
index c4354e8..8256979 100644 (file)
--- a/ansible/roles/helm/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/helm/molecule/ubuntu/molecule.yml
@@ -26,8 +26,6 @@ provisioner:
       all:
         app_name: onap
         app_data_path: "/opt/{{ app_name }}"
-scenario:
-  name: ubuntu
 verifier:
   name: testinfra
   directory: ../default/tests

diff --git a/ansible/roles/kubectl/molecule/default/molecule.yml b/ansible/roles/kubectl/molecule/default/molecule.yml
index b1a66be..a91d512 100644 (file)
--- a/ansible/roles/kubectl/molecule/default/molecule.yml
+++ b/ansible/roles/kubectl/molecule/default/molecule.yml
@@ -26,7 +26,5 @@ provisioner:
       all:
         app_name: onap
         app_data_path: "/opt/{{ app_name }}"
-scenario:
-  name: default
 verifier:
   name: testinfra

diff --git a/ansible/roles/kubectl/molecule/ubuntu/molecule.yml b/ansible/roles/kubectl/molecule/ubuntu/molecule.yml
index 56edda1..2defd48 100644 (file)
--- a/ansible/roles/kubectl/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/kubectl/molecule/ubuntu/molecule.yml
@@ -29,8 +29,6 @@ provisioner:
       all:
         app_name: onap
         app_data_path: "/opt/{{ app_name }}"
-scenario:
-  name: ubuntu
 verifier:
   name: testinfra
   directory: ../default/tests/

diff --git a/ansible/roles/nexus/molecule/default/molecule.yml b/ansible/roles/nexus/molecule/default/molecule.yml
index 735bf1b..c514561 100644 (file)
--- a/ansible/roles/nexus/molecule/default/molecule.yml
+++ b/ansible/roles/nexus/molecule/default/molecule.yml
@@ -25,7 +25,5 @@ provisioner:
   inventory:
     links:
       group_vars: ../../../../group_vars
-scenario:
-  name: default
 verifier:
   name: testinfra

diff --git a/ansible/roles/nexus/molecule/ubuntu/molecule.yml b/ansible/roles/nexus/molecule/ubuntu/molecule.yml
index 6925a9d..1c1eaa9 100644 (file)
--- a/ansible/roles/nexus/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/nexus/molecule/ubuntu/molecule.yml
@@ -29,7 +29,5 @@ provisioner:
     prepare: ../default/prepare.yml
     converge: ../default/converge.yml
     cleanup: ../default/cleanup.yml
-scenario:
-  name: ubuntu
 verifier:
   name: testinfra

diff --git a/ansible/roles/nfs/molecule/default/molecule.yml b/ansible/roles/nfs/molecule/default/molecule.yml
index e41b8a7..121297e 100644 (file)
--- a/ansible/roles/nfs/molecule/default/molecule.yml
+++ b/ansible/roles/nfs/molecule/default/molecule.yml
@@ -44,7 +44,5 @@ provisioner:
     links:
       group_vars: ../../../../group_vars
       host_vars: host_vars
-scenario:
-  name: default
 verifier:
   name: testinfra

diff --git a/ansible/roles/nfs/molecule/ubuntu/molecule.yml b/ansible/roles/nfs/molecule/ubuntu/molecule.yml
index 4cc5fb5..47201ce 100644 (file)
--- a/ansible/roles/nfs/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/nfs/molecule/ubuntu/molecule.yml
@@ -46,8 +46,6 @@ provisioner:
   playbooks:
     prepare: ../default/prepare.yml
     converge: ../default/converge.yml
-scenario:
-  name: ubuntu
 verifier:
   name: testinfra
   directory: ../default/tests

diff --git a/ansible/roles/nginx/molecule/ubuntu/molecule.yml b/ansible/roles/nginx/molecule/ubuntu/molecule.yml
index 6925a9d..1c1eaa9 100644 (file)
--- a/ansible/roles/nginx/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/nginx/molecule/ubuntu/molecule.yml
@@ -29,7 +29,5 @@ provisioner:
     prepare: ../default/prepare.yml
     converge: ../default/converge.yml
     cleanup: ../default/cleanup.yml
-scenario:
-  name: ubuntu
 verifier:
   name: testinfra

diff --git a/ansible/roles/package-repository-check/molecule/default/molecule.yml b/ansible/roles/package-repository-check/molecule/default/molecule.yml
index b60f009..7bb276e 100755 (executable)
--- a/ansible/roles/package-repository-check/molecule/default/molecule.yml
+++ b/ansible/roles/package-repository-check/molecule/default/molecule.yml
@@ -32,7 +32,6 @@ provisioner:
   env:
     ANSIBLE_ROLES_PATH: ../../../../test/roles
 scenario:
-  name: default
   test_sequence:
     - lint
     - cleanup

diff --git a/ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml b/ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml
index 3a1cf7c..84ccfb8 100755 (executable)
--- a/ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml
@@ -28,7 +28,6 @@ provisioner:
       infrastructure-server:
         cluster_ip: 6.5.4.3
 scenario:
-  name: ubuntu
   test_sequence:
     - lint
     - cleanup

diff --git a/ansible/roles/package-repository/molecule/ubuntu/molecule.yml b/ansible/roles/package-repository/molecule/ubuntu/molecule.yml
index 23a45ef..822cc6a 100644 (file)
--- a/ansible/roles/package-repository/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/package-repository/molecule/ubuntu/molecule.yml
@@ -41,8 +41,6 @@ provisioner:
       all:
         app_name: moleculetestapp
         app_data_path: "/opt/{{ app_name }}"
-scenario:
-  name: ubuntu
 verifier:
   name: testinfra
   options:

diff --git a/ansible/roles/rancher/molecule/default/molecule.yml b/ansible/roles/rancher/molecule/default/molecule.yml
index e9948cc..c605ad5 100644 (file)
--- a/ansible/roles/rancher/molecule/default/molecule.yml
+++ b/ansible/roles/rancher/molecule/default/molecule.yml
@@ -64,7 +64,6 @@ provisioner:
             #   ansible_ssh_pass: ${LOCALHOST_ANSIBLE_PASSWORD:-""}
             # End of 2)
 scenario:
-  name: default
   test_sequence:
     - lint
     - cleanup

diff --git a/ansible/roles/resource-data/molecule/default/molecule.yml b/ansible/roles/resource-data/molecule/default/molecule.yml
index ec41c2f..89e3888 100644 (file)
--- a/ansible/roles/resource-data/molecule/default/molecule.yml
+++ b/ansible/roles/resource-data/molecule/default/molecule.yml
@@ -40,7 +40,5 @@ provisioner:
   log: true
   env:
     ANSIBLE_ROLES_PATH: ../../../../test/roles/
-scenario:
-  name: default
 verifier:
   name: testinfra

diff --git a/ansible/roles/resource-data/molecule/ubuntu/molecule.yml b/ansible/roles/resource-data/molecule/ubuntu/molecule.yml
index f60b02d..1e18b04 100644 (file)
--- a/ansible/roles/resource-data/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/resource-data/molecule/ubuntu/molecule.yml
@@ -43,8 +43,6 @@ provisioner:
   playbooks:
     prepare: ../default/prepare.yml
     converge: ../default/converge.yml
-scenario:
-  name: ubuntu
 verifier:
   name: testinfra
   directory: ../default/tests

diff --git a/ansible/roles/rke/molecule/default/molecule.yml b/ansible/roles/rke/molecule/default/molecule.yml
index 64da190..994d44f 100644 (file)
--- a/ansible/roles/rke/molecule/default/molecule.yml
+++ b/ansible/roles/rke/molecule/default/molecule.yml
@@ -38,7 +38,5 @@ provisioner:
         cluster_config_dir: /opt/onap/cluster
   options:
     e: "app_data_path=/opt/onap"
-scenario:
-  name: default
 verifier:
   name: testinfra

diff --git a/ansible/roles/rke/molecule/etcd_storage/molecule.yml b/ansible/roles/rke/molecule/etcd_storage/molecule.yml
index 5c8a573..35ad7e9 100644 (file)
--- a/ansible/roles/rke/molecule/etcd_storage/molecule.yml
+++ b/ansible/roles/rke/molecule/etcd_storage/molecule.yml
@@ -48,7 +48,5 @@ provisioner:
     prepare: ../default/prepare.yml
     converge: ../default/converge.yml
     destroy: ../default/destroy.yml
-scenario:
-  name: etcd_storage
 verifier:
   name: testinfra

diff --git a/ansible/roles/setup/molecule/default/molecule.yml b/ansible/roles/setup/molecule/default/molecule.yml
index 82ab123..33cc223 100644 (file)
--- a/ansible/roles/setup/molecule/default/molecule.yml
+++ b/ansible/roles/setup/molecule/default/molecule.yml
@@ -13,7 +13,5 @@ platforms:
     image: ${PLATFORM_DISTRO:-centos}:${DISTRO_VERSION:-7}
 provisioner:
   name: ansible
-scenario:
-  name: default
 verifier:
   name: testinfra

diff --git a/ansible/roles/setup/molecule/ubuntu/molecule.yml b/ansible/roles/setup/molecule/ubuntu/molecule.yml
index 0d9b9c9..994bca2 100644 (file)
--- a/ansible/roles/setup/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/setup/molecule/ubuntu/molecule.yml
@@ -16,8 +16,6 @@ provisioner:
   name: ansible
   playbooks:
     converge: ../default/converge.yml
-scenario:
-  name: ubuntu
 verifier:
   name: testinfra
   directory: ../default/tests/

diff --git a/ansible/roles/vncserver/molecule/ubuntu/molecule.yml b/ansible/roles/vncserver/molecule/ubuntu/molecule.yml
index 604d736..113869e 100644 (file)
--- a/ansible/roles/vncserver/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/vncserver/molecule/ubuntu/molecule.yml
@@ -29,8 +29,6 @@ provisioner:
   inventory:
     links:
       group_vars: ../../../../group_vars
-scenario:
-  name: ubuntu
 verifier:
   name: testinfra
   options:

diff --git a/ansible/test/play-infrastructure/molecule/default/molecule.yml b/ansible/test/play-infrastructure/molecule/default/molecule.yml
index 1098dc8..b30776e 100644 (file)
--- a/ansible/test/play-infrastructure/molecule/default/molecule.yml
+++ b/ansible/test/play-infrastructure/molecule/default/molecule.yml
@@ -47,7 +47,6 @@ provisioner:
     links:
       group_vars: ../../../../group_vars
 scenario:
-  name: default
   test_sequence:
     - lint
     - cleanup

diff --git a/ansible/test/play-rke/molecule/default/molecule.yml b/ansible/test/play-rke/molecule/default/molecule.yml
index af86114..13fe96b 100644 (file)
--- a/ansible/test/play-rke/molecule/default/molecule.yml
+++ b/ansible/test/play-rke/molecule/default/molecule.yml
@@ -32,7 +32,5 @@ provisioner:
   env:
     ANSIBLE_ROLES_PATH: ../../../../test/roles
     ANSIBLE_LIBRARY: ../../../../library
-scenario:
-  name: default
 verifier:
   name: testinfra

diff --git a/ansible/test/play-rke/molecule/helm3/molecule.yml b/ansible/test/play-rke/molecule/helm3/molecule.yml
index e76da04..13fe96b 100644 (file)
--- a/ansible/test/play-rke/molecule/helm3/molecule.yml
+++ b/ansible/test/play-rke/molecule/helm3/molecule.yml
@@ -32,7 +32,5 @@ provisioner:
   env:
     ANSIBLE_ROLES_PATH: ../../../../test/roles
     ANSIBLE_LIBRARY: ../../../../library
-scenario:
-  name: helm3
 verifier:
   name: testinfra