From d7c17df711cd89f4270cc2972e7144283ea992c1 Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Fri, 9 Apr 2021 11:55:46 +0200 Subject: [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 --- ansible/roles/application/molecule/custom_role/molecule.yml | 1 - ansible/roles/application/molecule/default/molecule.yml | 1 - ansible/roles/application/molecule/helm3/molecule.yml | 1 - ansible/roles/application/molecule/ubuntu/molecule.yml | 1 - ansible/roles/certificates/molecule/default/molecule.yml | 1 - ansible/roles/certificates/molecule/ubuntu/molecule.yml | 1 - ansible/roles/chartmuseum/molecule/default/molecule.yml | 2 -- ansible/roles/chartmuseum/molecule/ubuntu/molecule.yml | 2 -- ansible/roles/dns/molecule/ubuntu/molecule.yml | 2 -- ansible/roles/docker/molecule/default/molecule.yml | 2 -- ansible/roles/docker/molecule/ubuntu/molecule.yml | 2 -- ansible/roles/helm/molecule/default/molecule.yml | 2 -- ansible/roles/helm/molecule/helm3/molecule.yml | 2 -- ansible/roles/helm/molecule/ubuntu/molecule.yml | 2 -- ansible/roles/kubectl/molecule/default/molecule.yml | 2 -- ansible/roles/kubectl/molecule/ubuntu/molecule.yml | 2 -- ansible/roles/nexus/molecule/default/molecule.yml | 2 -- ansible/roles/nexus/molecule/ubuntu/molecule.yml | 2 -- ansible/roles/nfs/molecule/default/molecule.yml | 2 -- ansible/roles/nfs/molecule/ubuntu/molecule.yml | 2 -- ansible/roles/nginx/molecule/ubuntu/molecule.yml | 2 -- ansible/roles/package-repository-check/molecule/default/molecule.yml | 1 - ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml | 1 - ansible/roles/package-repository/molecule/ubuntu/molecule.yml | 2 -- ansible/roles/rancher/molecule/default/molecule.yml | 1 - ansible/roles/resource-data/molecule/default/molecule.yml | 2 -- ansible/roles/resource-data/molecule/ubuntu/molecule.yml | 2 -- ansible/roles/rke/molecule/default/molecule.yml | 2 -- ansible/roles/rke/molecule/etcd_storage/molecule.yml | 2 -- ansible/roles/setup/molecule/default/molecule.yml | 2 -- ansible/roles/setup/molecule/ubuntu/molecule.yml | 2 -- ansible/roles/vncserver/molecule/ubuntu/molecule.yml | 2 -- 32 files changed, 55 deletions(-) (limited to 'ansible/roles') diff --git a/ansible/roles/application/molecule/custom_role/molecule.yml b/ansible/roles/application/molecule/custom_role/molecule.yml index 733ad188..64ebe3d2 100644 --- 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 e516f0f2..53c5b154 100644 --- 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 8ca5fca1..aff7a242 100644 --- 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 42523388..0d5049a5 100644 --- 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 4751dbd2..fd703ca5 100644 --- 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 aa519907..c2854e3b 100644 --- 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 5c9dce79..2b64ce94 100644 --- 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 8b50ec54..1165bd15 100644 --- 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 ae763c22..191da95e 100644 --- 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 031aa5fc..10ce1f45 100644 --- 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 a4705a14..5abaef5b 100644 --- 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 b20e2a1e..aa9bd19f 100644 --- 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 4b582f5c..e2f7e814 100644 --- 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 c4354e88..82569797 100644 --- 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 b1a66be2..a91d5125 100644 --- 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 56edda13..2defd489 100644 --- 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 735bf1bb..c5145611 100644 --- 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 6925a9d4..1c1eaa9b 100644 --- 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 e41b8a7d..121297e2 100644 --- 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 4cc5fb55..47201cef 100644 --- 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 6925a9d4..1c1eaa9b 100644 --- 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 b60f0091..7bb276e4 100755 --- 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 3a1cf7cd..84ccfb85 100755 --- 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 23a45ef9..822cc6a0 100644 --- 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 e9948cc2..c605ad54 100644 --- 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 ec41c2f2..89e3888f 100644 --- 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 f60b02d5..1e18b041 100644 --- 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 64da190f..994d44fc 100644 --- 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 5c8a5732..35ad7e96 100644 --- 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 82ab123a..33cc2239 100644 --- 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 0d9b9c9f..994bca2e 100644 --- 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 604d7360..113869e4 100644 --- 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: -- cgit 1.2.3-korg