From dbd75bb2479454088224e8c7319933cddfab4445 Mon Sep 17 00:00:00 2001
From: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Date: Wed, 24 Nov 2021 13:28:29 +0100
Subject: [PATCH] [MOLECULE] Drop custom test scenario for helm v3

Helm v3 is now the default so removing its custom test
scenario.

Change-Id: I2c2fa2594a743a1502fe0b414aa75c145cbaa5d9
Issue-ID: OOM-2883
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
---
 ansible/roles/helm/molecule/default/Dockerfile.j2 |  2 +-
 ansible/roles/helm/molecule/default/converge.yml  |  2 --
 ansible/roles/helm/molecule/default/prepare.yml   |  2 --
 ansible/roles/helm/molecule/default/vars.yml      |  1 -
 ansible/roles/helm/molecule/helm3/Dockerfile.j2   |  1 -
 ansible/roles/helm/molecule/helm3/converge.yml    |  1 -
 ansible/roles/helm/molecule/helm3/molecule.yml    | 28 -----------------------
 ansible/roles/helm/molecule/helm3/prepare.yml     |  1 -
 ansible/roles/helm/molecule/helm3/vars.yml        |  2 --
 9 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 ansible/roles/helm/molecule/default/vars.yml
 delete mode 120000 ansible/roles/helm/molecule/helm3/Dockerfile.j2
 delete mode 120000 ansible/roles/helm/molecule/helm3/converge.yml
 delete mode 100644 ansible/roles/helm/molecule/helm3/molecule.yml
 delete mode 120000 ansible/roles/helm/molecule/helm3/prepare.yml
 delete mode 100644 ansible/roles/helm/molecule/helm3/vars.yml

diff --git a/ansible/roles/helm/molecule/default/Dockerfile.j2 b/ansible/roles/helm/molecule/default/Dockerfile.j2
index e6aa95d3..05219121 100644
--- a/ansible/roles/helm/molecule/default/Dockerfile.j2
+++ b/ansible/roles/helm/molecule/default/Dockerfile.j2
@@ -6,7 +6,7 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates curl && apt-get clean; \
     elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
diff --git a/ansible/roles/helm/molecule/default/converge.yml b/ansible/roles/helm/molecule/default/converge.yml
index 0f3fbc27..68189c54 100644
--- a/ansible/roles/helm/molecule/default/converge.yml
+++ b/ansible/roles/helm/molecule/default/converge.yml
@@ -4,7 +4,5 @@
   pre_tasks:
     - name: Include infrastructure group variables
       include_vars: ../../../../group_vars/infrastructure.yml
-    - name: Include test scenario variables
-      include_vars: vars.yml
   roles:
     - helm
diff --git a/ansible/roles/helm/molecule/default/prepare.yml b/ansible/roles/helm/molecule/default/prepare.yml
index 10ccf232..34c41e8e 100644
--- a/ansible/roles/helm/molecule/default/prepare.yml
+++ b/ansible/roles/helm/molecule/default/prepare.yml
@@ -4,7 +4,5 @@
   pre_tasks:
     - name: Include infrastructure group variables
       include_vars: ../../../../group_vars/infrastructure.yml
-    - name: Include test scenario variables
-      include_vars: vars.yml
   roles:
     - prepare-helm
diff --git a/ansible/roles/helm/molecule/default/vars.yml b/ansible/roles/helm/molecule/default/vars.yml
deleted file mode 100644
index ed97d539..00000000
--- a/ansible/roles/helm/molecule/default/vars.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/ansible/roles/helm/molecule/helm3/Dockerfile.j2 b/ansible/roles/helm/molecule/helm3/Dockerfile.j2
deleted file mode 120000
index 867ec5c3..00000000
--- a/ansible/roles/helm/molecule/helm3/Dockerfile.j2
+++ /dev/null
@@ -1 +0,0 @@
-../default/Dockerfile.j2
\ No newline at end of file
diff --git a/ansible/roles/helm/molecule/helm3/converge.yml b/ansible/roles/helm/molecule/helm3/converge.yml
deleted file mode 120000
index 73cb8dad..00000000
--- a/ansible/roles/helm/molecule/helm3/converge.yml
+++ /dev/null
@@ -1 +0,0 @@
-../default/converge.yml
\ No newline at end of file
diff --git a/ansible/roles/helm/molecule/helm3/molecule.yml b/ansible/roles/helm/molecule/helm3/molecule.yml
deleted file mode 100644
index e2f7e814..00000000
--- a/ansible/roles/helm/molecule/helm3/molecule.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-dependency:
-  name: galaxy
-driver:
-  name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint .
-  flake8
-platforms:
-  - name: infrastructure-server-helm3
-    image: centos:7
-    groups:
-      - infrastructure
-provisioner:
-  name: ansible
-  env:
-    ANSIBLE_ROLES_PATH: ../../../../test/roles
-    ANSIBLE_LIBRARY: ../../../../library
-  inventory:
-    group_vars:
-      all:
-        app_name: onap
-        app_data_path: "/opt/{{ app_name }}"
-verifier:
-  name: testinfra
-  directory: ../default/tests
diff --git a/ansible/roles/helm/molecule/helm3/prepare.yml b/ansible/roles/helm/molecule/helm3/prepare.yml
deleted file mode 120000
index 1c017d9a..00000000
--- a/ansible/roles/helm/molecule/helm3/prepare.yml
+++ /dev/null
@@ -1 +0,0 @@
-../default/prepare.yml
\ No newline at end of file
diff --git a/ansible/roles/helm/molecule/helm3/vars.yml b/ansible/roles/helm/molecule/helm3/vars.yml
deleted file mode 100644
index 94203705..00000000
--- a/ansible/roles/helm/molecule/helm3/vars.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-helm_version: v3.6.3
-- 
2.16.6