summaryrefslogtreecommitdiffstats
path: root/ansible
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2019-06-26 10:42:49 +0200
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2019-06-26 10:42:49 +0200
commit61d7bfee9cf357ee4846ea2839d2be9aab2aa253 (patch)
tree4efeee2b5be142cec5de01b1ab9d486a206c200a /ansible
parentf6bd937571c8f88bcf506d11ef06243e7851f2cf (diff)
Fix tests for binaries preparation in installation steps
Change-Id: Ib28bda24b711111c13bbaf9bd2628abd2001a1a9 Issue-ID: OOM-1925 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'ansible')
-rwxr-xr-xansible/group_vars/infrastructure.yml2
l---------ansible/roles/helm/molecule/default/group_vars/infrastructure.yml1
-rw-r--r--ansible/roles/helm/molecule/default/prepare.yml5
-rw-r--r--ansible/test/roles/prepare-helm/defaults/main.yml3
-rw-r--r--ansible/test/roles/prepare-helm/tasks/main.yml2
5 files changed, 7 insertions, 6 deletions
diff --git a/ansible/group_vars/infrastructure.yml b/ansible/group_vars/infrastructure.yml
index a6e2d775..fc0699c5 100755
--- a/ansible/group_vars/infrastructure.yml
+++ b/ansible/group_vars/infrastructure.yml
@@ -25,7 +25,7 @@ simulated_hosts:
- registry.hub.docker.com
- registry.npmjs.org
all_simulated_hosts:
- "{{ simulated_hosts.git + simulated_hosts.http + simulated_hosts.nexus }}"
+ "{{ simulated_hosts.git + simulated_hosts.http + simulated_hosts.nexus }}"
populate_nexus: false
helm_bin_dir: /usr/local/bin
helm_version: v2.12.3
diff --git a/ansible/roles/helm/molecule/default/group_vars/infrastructure.yml b/ansible/roles/helm/molecule/default/group_vars/infrastructure.yml
new file mode 120000
index 00000000..3e9c2f0c
--- /dev/null
+++ b/ansible/roles/helm/molecule/default/group_vars/infrastructure.yml
@@ -0,0 +1 @@
+../../../../../group_vars/infrastructure.yml \ No newline at end of file
diff --git a/ansible/roles/helm/molecule/default/prepare.yml b/ansible/roles/helm/molecule/default/prepare.yml
index 8a149b89..34c41e8e 100644
--- a/ansible/roles/helm/molecule/default/prepare.yml
+++ b/ansible/roles/helm/molecule/default/prepare.yml
@@ -1,5 +1,8 @@
---
- name: Prepare for helm tests
- hosts: all
+ hosts: infrastructure
+ pre_tasks:
+ - name: Include infrastructure group variables
+ include_vars: ../../../../group_vars/infrastructure.yml
roles:
- prepare-helm
diff --git a/ansible/test/roles/prepare-helm/defaults/main.yml b/ansible/test/roles/prepare-helm/defaults/main.yml
deleted file mode 100644
index 8ab9ed3a..00000000
--- a/ansible/test/roles/prepare-helm/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# Helm version to download.
-helm_version: 2.12.3
diff --git a/ansible/test/roles/prepare-helm/tasks/main.yml b/ansible/test/roles/prepare-helm/tasks/main.yml
index d6fabae9..1f461258 100644
--- a/ansible/test/roles/prepare-helm/tasks/main.yml
+++ b/ansible/test/roles/prepare-helm/tasks/main.yml
@@ -7,6 +7,6 @@
- name: "Download helm-{{ helm_version }}"
get_url:
- url: "https://get.helm.sh/helm-v{{ helm_version }}-linux-amd64.tar.gz"
+ url: "https://get.helm.sh/helm-{{ helm_version }}-linux-amd64.tar.gz"
dest: "{{ app_data_path }}/downloads"
remote_src: true