diff options
| author |   Samuli Silvius <s.silvius@partner.samsung.com> | 2019-06-26 10:46:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-06-26 10:46:26 +0000 |
| commit | 9591bbf978d8e738143f4a94b6df7045e4074f78 (patch) | |
| tree | 93842191cfbb0487072026f348aab8f49492efdb /ansible/test/roles | |
| parent | 1dd72bddf480e3af3b82ce7863d9397dc9c71003 (diff) | |
| parent | 61d7bfee9cf357ee4846ea2839d2be9aab2aa253 (diff) | |
Merge changes from topic "bin_utils"
* changes:
Fix tests for binaries preparation in installation steps
Add binaries preparation to installation steps
Diffstat (limited to 'ansible/test/roles')
| -rw-r--r-- | ansible/test/roles/prepare-helm/defaults/main.yml | 3 | ||||
| -rw-r--r-- | ansible/test/roles/prepare-helm/tasks/main.yml | 14 | ||||
| -rw-r--r-- | ansible/test/roles/prepare-rke/tasks/infra.yml | 2 |
3 files changed, 5 insertions, 14 deletions
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 aa01e281..1f461258 100644 --- a/ansible/test/roles/prepare-helm/tasks/main.yml +++ b/ansible/test/roles/prepare-helm/tasks/main.yml @@ -5,14 +5,8 @@ recurse: true state: directory -- name: "Download and unarchive helm-{{ helm_version }}" - unarchive: - src: "https://get.helm.sh/helm-v{{ helm_version }}-linux-amd64.tar.gz" - dest: "/tmp" - remote_src: true - -- name: "Copy helm binary" - copy: - src: /tmp/linux-amd64/helm - dest: "{{ app_data_path }}/downloads/helm" +- name: "Download helm-{{ helm_version }}" + get_url: + url: "https://get.helm.sh/helm-{{ helm_version }}-linux-amd64.tar.gz" + dest: "{{ app_data_path }}/downloads" remote_src: true diff --git a/ansible/test/roles/prepare-rke/tasks/infra.yml b/ansible/test/roles/prepare-rke/tasks/infra.yml index 55ab7f16..e9971f77 100644 --- a/ansible/test/roles/prepare-rke/tasks/infra.yml +++ b/ansible/test/roles/prepare-rke/tasks/infra.yml @@ -7,7 +7,7 @@ - name: "Install rke-{{ rke_version }}" get_url: url: "https://github.com/rancher/rke/releases/download/v{{ rke_version }}/rke_linux-amd64" - dest: "{{ app_data_path }}/downloads/rke" + dest: "{{ app_data_path }}/downloads/rke_linux-amd64" - name: "Install kubectl-{{ kubectl_version }}" get_url: |