summaryrefslogtreecommitdiffstats
path: root/ansible/roles/application/molecule
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2021-01-26 09:35:25 +0100
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2021-01-26 08:39:21 +0000
commit8b2864df4f19783062f3a460227994032d923ff4 (patch)
tree159f4d4cbe0e766f017e8a5bfb358dde00b7dcc3 /ansible/roles/application/molecule
parent52bd1fdc541a9277e5a24437576902511113670d (diff)
Split Helm v2 setup to separate playbook
Logically splitting the application playbook to put Helm v2 and v3 specific setup actions into separate tasks file. Change-Id: I20446a196bb2687e27fdeb6a45a83565b676fc42 Issue-ID: OOM-2665 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'ansible/roles/application/molecule')
-rw-r--r--ansible/roles/application/molecule/default/tests/test_default.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/ansible/roles/application/molecule/default/tests/test_default.py b/ansible/roles/application/molecule/default/tests/test_default.py
index df50c472..1451a8fe 100644
--- a/ansible/roles/application/molecule/default/tests/test_default.py
+++ b/ansible/roles/application/molecule/default/tests/test_default.py
@@ -10,10 +10,7 @@ def test_helm_commands(host):
fc = host.file('/tmp/helm_simu_output').content_string
helm_release = host.ansible.get_variables()['helm_version']
if helm_release == 'v2':
- content_str1 = 'home'
- elif helm_release == 'v3':
- content_str1 = 'env'
- expected_content = content_str1 + """
+ expected_content = """home
init --upgrade --skip-refresh
version --tiller-connection-timeout 10
repo list
@@ -24,6 +21,12 @@ deploy moleculetestapp local/moleculetestapp --namespace \
moleculetestapp -f /opt/moleculetestapp/helm_charts/onap/resources/\
overrides/onap-all.yaml -f /opt/moleculetestapp/override.yaml \
--timeout 1800"""
+ elif helm_release == 'v3':
+ expected_content = """env
+deploy moleculetestapp local/moleculetestapp --namespace \
+moleculetestapp -f /opt/moleculetestapp/helm_charts/onap/resources/\
+overrides/onap-all.yaml -f /opt/moleculetestapp/override.yaml \
+--timeout 1800"""
assert fc == expected_content