diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2021-11-24 13:28:29 +0100 |
|---|---|---|
| committer | Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2021-12-03 09:20:34 +0100 |
| commit | 575e155848fc467ba2169861639514f94f40124a (patch) | |
| tree | b34f96205d2b05c2b3227bd117749e7dd3d93da9 /ansible/roles/helm/molecule/default | |
| parent | 2c2e6758162e20e7828a5c6c9a5840c7026a350d (diff) | |
[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>
Diffstat (limited to 'ansible/roles/helm/molecule/default')
| -rw-r--r-- | ansible/roles/helm/molecule/default/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/helm/molecule/default/converge.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/helm/molecule/default/prepare.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/helm/molecule/default/vars.yml | 1 |
4 files changed, 1 insertions, 6 deletions
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 @@ ---- |