Bugfix: install sonobuoy executable in playbook (#924)

* Bugfix: install sonobuoy executable in playbook

Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>

* factor our sonobuoy download url as variable

something similar was suggested by @berendt

Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>

* remove whitespace from url

Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>

* use ansible_user_dir

Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>

* use ansible user dir even more

Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>

* smarter search for Sonobuoy executable

Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>

---------

Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>

Author: mbuechse

.zuul.d/config.yaml

@@ -35,6 +35,8 @@
       kaas: false
       do_provision: false
       do_cleanup: true
+      sonobuoy_tar_gz_url: >
+        https://github.com/vmware-tanzu/sonobuoy/releases/download/v0.57.3/sonobuoy_0.57.3_linux_amd64.tar.gz
     pre-run:
      - playbooks/pre.yaml
      - playbooks/pre_cloud.yaml

Tests/kaas/sonobuoy_handler/sonobuoy_handler.py

@@ -2,6 +2,7 @@
 import json
 import logging
 import os
+import os.path
 import shlex
 import shutil
 import subprocess
@@ -11,6 +12,16 @@
 logger = logging.getLogger(__name__)
 
 
+def _find_sonobuoy():
+    """find sonobuoy in PATH, but also in a fixed location at ~/.local/bin to simplify use with Ansible"""
+    result = shutil.which('sonobuoy')
+    if result:
+        return result
+    result = os.path.join(os.path.expanduser('~'), '.local', 'bin', 'sonobuoy')
+    if os.path.exists(result):
+        return result
+
+
 class SonobuoyHandler:
     """
     A class that handles both the execution of sonobuoy and
@@ -34,7 +45,7 @@ def __init__(
         self.kubeconfig_path = kubeconfig
         self.working_directory = os.getcwd()
         self.result_dir_name = result_dir_name
-        self.sonobuoy = shutil.which('sonobuoy')
+        self.sonobuoy = _find_sonobuoy()
         logger.debug(f"working from {self.working_directory}")
         logger.debug(f"placing results at {self.result_dir_name}")
         logger.debug(f"sonobuoy executable at {self.sonobuoy}")

playbooks/pre_cloud.yaml

@@ -17,29 +17,43 @@
         requirements: "Tests/kaas/requirements.txt"
       when: kaas | bool
 
+    - name: Create local binary dir
+      ansible.builtin.file:
+        path: "{{ ansible_user_dir}}/.local/bin"
+        state: directory
+        recurse: true
+
+    - name: Install Sonobuoy
+      ansible.builtin.shell:
+        curl -L {{ sonobuoy_tar_gz_url | trim | quote }} | tar xz sonobuoy
+      args:
+        chdir: "{{ ansible_user_dir}}/.local/bin/"
+        creates: sonobuoy
+      when: kaas | bool
+
     - name: Create cloud config dir
       ansible.builtin.file:
-        path: "~/.config/openstack"
+        path: "{{ ansible_user_dir }}/.config/openstack"
         state: directory
         recurse: true
         mode: "0700"
 
     - name: Create cloud config file
       ansible.builtin.template:
         src: "clouds.yaml.j2"
-        dest: "~/.config/openstack/clouds.yaml"
+        dest: "{{ ansible_user_dir }}/.config/openstack/clouds.yaml"
         mode: "0600"
       no_log: true
 
     - name: Create cluster config dir
       ansible.builtin.copy:
         src: ".config"
-        dest: "~/"
+        dest: "{{ ansible_user_dir }}/"
 
     - name: Create cluster config file
       ansible.builtin.template:
         src: "clusters.yaml.j2"
-        dest: "~/.config/scs/clusters.yaml"
+        dest: "{{ ansible_user_dir }}/.config/scs/clusters.yaml"
         mode: "0600"
       no_log: true