From d6a372b2d2e440bbee5bdb21567aa36063b585ad Mon Sep 17 00:00:00 2001
From: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Date: Wed, 24 Nov 2021 15:05:40 +0100
Subject: [PATCH] [MOLECULE] Drop custom helm3 scenario for application role

Helm v3 is the default now so removing its custom scenario

Change-Id: I8814d2a61e47d43e56df43889e730fada7ba99a6
Issue-ID: OOM-2883
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
---
 .../application/molecule/custom_role/molecule.yml  |  2 +-
 .../application/molecule/default/molecule.yml      |  2 +-
 .../roles/application/molecule/helm3/molecule.yml  | 52 ----------------------
 ansible/roles/application/molecule/helm3/tests     |  1 -
 .../molecule/{helm3 => ubuntu}/Dockerfile.j2       |  0
 .../roles/application/molecule/ubuntu/molecule.yml |  3 +-
 6 files changed, 3 insertions(+), 57 deletions(-)
 delete mode 100644 ansible/roles/application/molecule/helm3/molecule.yml
 delete mode 120000 ansible/roles/application/molecule/helm3/tests
 rename ansible/roles/application/molecule/{helm3 => ubuntu}/Dockerfile.j2 (100%)

diff --git a/ansible/roles/application/molecule/custom_role/molecule.yml b/ansible/roles/application/molecule/custom_role/molecule.yml
index 64ebe3d2..fed1b121 100644
--- a/ansible/roles/application/molecule/custom_role/molecule.yml
+++ b/ansible/roles/application/molecule/custom_role/molecule.yml
@@ -32,7 +32,7 @@ provisioner:
         app_helm_chart_name: "{{ app_name }}"
         application_pre_install_role: application/test-patch-role
         application_post_install_role: application/test-patch-role
-        helm_version: v2
+        helm_version: v3
   playbooks:
     prepare: ../default/prepare.yml
     converge: ../default/converge.yml
diff --git a/ansible/roles/application/molecule/default/molecule.yml b/ansible/roles/application/molecule/default/molecule.yml
index 53c5b154..8b2817b4 100644
--- a/ansible/roles/application/molecule/default/molecule.yml
+++ b/ansible/roles/application/molecule/default/molecule.yml
@@ -30,7 +30,7 @@ provisioner:
           - all
           - onap
         app_helm_chart_name: "{{ app_name }}"
-        helm_version: v2
+        helm_version: v3
 scenario:
   test_sequence:
     - lint
diff --git a/ansible/roles/application/molecule/helm3/molecule.yml b/ansible/roles/application/molecule/helm3/molecule.yml
deleted file mode 100644
index aff7a242..00000000
--- a/ansible/roles/application/molecule/helm3/molecule.yml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-dependency:
-  name: galaxy
-driver:
-  name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint .
-  flake8
-platforms:
-  - name: instance-helm3
-    image: centos:7
-provisioner:
-  name: ansible
-  env:
-    ANSIBLE_ROLES_PATH: ../../../../test/roles
-  inventory:
-    group_vars:
-      all:
-        app_name: moleculetestapp
-        app_data_path: "/opt/{{ app_name }}"
-        app_helm_release_name: "{{ app_name }}"
-        app_kubernetes_namespace: "{{ app_name }}"
-        app_helm_charts_install_directory: application/helm_charts
-        app_helm_plugins_directory: "{{ app_helm_charts_install_directory}}/helm/plugins/"
-        app_helm_charts_infra_directory: "{{ app_data_path }}/helm_charts"
-        helm_bin_dir: /usr/local/bin
-        app_helm_build_targets:
-          - all
-          - onap
-        app_helm_chart_name: "{{ app_name }}"
-        helm_version: v3
-  playbooks:
-    prepare: ../default/prepare.yml
-    converge: ../default/converge.yml
-    cleanup: ../default/cleanup.yml
-scenario:
-  test_sequence:
-    - lint
-    - cleanup
-    - destroy
-    - dependency
-    - syntax
-    - create
-    - prepare
-    - converge
-    - verify
-    - cleanup
-    - destroy
-verifier:
-  name: testinfra
diff --git a/ansible/roles/application/molecule/helm3/tests b/ansible/roles/application/molecule/helm3/tests
deleted file mode 120000
index b8ac4407..00000000
--- a/ansible/roles/application/molecule/helm3/tests
+++ /dev/null
@@ -1 +0,0 @@
-../default/tests/
\ No newline at end of file
diff --git a/ansible/roles/application/molecule/helm3/Dockerfile.j2 b/ansible/roles/application/molecule/ubuntu/Dockerfile.j2
similarity index 100%
rename from ansible/roles/application/molecule/helm3/Dockerfile.j2
rename to ansible/roles/application/molecule/ubuntu/Dockerfile.j2
diff --git a/ansible/roles/application/molecule/ubuntu/molecule.yml b/ansible/roles/application/molecule/ubuntu/molecule.yml
index 0d5049a5..e785f846 100644
--- a/ansible/roles/application/molecule/ubuntu/molecule.yml
+++ b/ansible/roles/application/molecule/ubuntu/molecule.yml
@@ -11,7 +11,6 @@ lint: |
 platforms:
   - name: instance
     image: ubuntu:18.04
-    dockerfile: ../default/Dockerfile.j2
 provisioner:
   name: ansible
   env:
@@ -31,7 +30,7 @@ provisioner:
           - all
           - onap
         app_helm_chart_name: "{{ app_name }}"
-        helm_version: v2
+        helm_version: v3
   playbooks:
     prepare: ../default/prepare.yml
     converge: ../default/converge.yml
-- 
2.16.6