diff --git a/playbooks/helm/run.yaml b/playbooks/helm/run.yaml index adf2bbf9c..e8d9d36a9 100644 --- a/playbooks/helm/run.yaml +++ b/playbooks/helm/run.yaml @@ -1,6 +1,7 @@ - hosts: all tasks: - - include_role: + - name: Install helm charts + include_role: name: helm-template vars: helm_release_name: "{{ zj_item.key }}" diff --git a/roles/add-build-sshkey/tasks/create-key-and-replace.yaml b/roles/add-build-sshkey/tasks/create-key-and-replace.yaml index 2c898546e..6b459b6ce 100644 --- a/roles/add-build-sshkey/tasks/create-key-and-replace.yaml +++ b/roles/add-build-sshkey/tasks/create-key-and-replace.yaml @@ -11,7 +11,8 @@ include_tasks: remote-windows.yaml when: ansible_os_family == "Windows" -- import_role: +- name: Remove zuul master ssh key + import_role: name: remove-zuul-sshkey - name: Add back temp key diff --git a/roles/ensure-bazel/tasks/install-bazel.yaml b/roles/ensure-bazel/tasks/install-bazel.yaml index 3db793d6e..735462052 100644 --- a/roles/ensure-bazel/tasks/install-bazel.yaml +++ b/roles/ensure-bazel/tasks/install-bazel.yaml @@ -9,7 +9,8 @@ return_content: true register: bazel_installer_checksum -- debug: +- name: Display checksum + debug: msg: "Checksum is {{ bazel_installer_checksum.content.split(' ')[0] }}" - name: Download bazel installer @@ -19,9 +20,11 @@ mode: 0755 checksum: "sha256:{{ bazel_installer_checksum.content.split(' ')[0] }}" -- debug: +- name: Display distribution + debug: msg: "Distribution is {{ ansible_distribution }}" -- debug: +- name: Display OS family + debug: msg: "OS family is {{ ansible_os_family }}" - name: Install bazel and platform-specific dependencies diff --git a/roles/ensure-bazel/tasks/main.yaml b/roles/ensure-bazel/tasks/main.yaml index 3c5c52bcf..500730d94 100644 --- a/roles/ensure-bazel/tasks/main.yaml +++ b/roles/ensure-bazel/tasks/main.yaml @@ -5,7 +5,8 @@ failed_when: false register: installed_bazel_version -- debug: +- name: Display Bazel version + debug: msg: "Current installed Bazel version is {{ installed_bazel_version.stdout }}" - name: Download and install Bazel if needed diff --git a/roles/git-prepare-nodecache/defaults/main.yaml b/roles/git-prepare-nodecache/defaults/main.yaml index 96072c918..a227daa9a 100644 --- a/roles/git-prepare-nodecache/defaults/main.yaml +++ b/roles/git-prepare-nodecache/defaults/main.yaml @@ -1 +1 @@ -git_cache_root: "{{ansible_user_dir }}/git-cache" +git_cache_root: "{{ ansible_user_dir }}/git-cache" diff --git a/roles/npm/tasks/main.yaml b/roles/npm/tasks/main.yaml index 91588145b..a4cf7a21a 100644 --- a/roles/npm/tasks/main.yaml +++ b/roles/npm/tasks/main.yaml @@ -3,7 +3,8 @@ msg: npm_command is required for this role when: npm_command is not defined -- include_role: +- name: Run npm + include_role: name: js-package-manager vars: js_build_command: '{{ npm_command }}' diff --git a/roles/yarn/tasks/main.yaml b/roles/yarn/tasks/main.yaml index 16fb0444e..9dbfb0f1f 100644 --- a/roles/yarn/tasks/main.yaml +++ b/roles/yarn/tasks/main.yaml @@ -3,7 +3,8 @@ msg: yarn_command is required for this role when: yarn_command is not defined -- include_role: +- name: Run yarn + include_role: name: js-package-manager vars: js_build_command: '{{ yarn_command }}'