playbooks: Fix CI for containers#897 & restructure it

adjustmnets to the Toolbx binary that it requires presence of /run/host
in both the host filesystem and the filesystem in a container.

The presence of the directory is assured by systemd-tmpfiles by
running it before the binary is started for the first time. This lead
to the realization that the playbook structure is needlessly
separated and can be unified as there is close to no benefit in keeping
it separated.

containers#898

playbooks/setup-env.yaml

@@ -1,5 +1,6 @@
 ---
 - hosts: all
+
   tasks:
     - name: Install requirements
       become: yes
@@ -26,17 +27,36 @@
       args:
         chdir: '{{ zuul.project.src_dir }}'
 
-    - name: Setup environment
-      become: yes
-      command:
-        cmd: systemd-tmpfiles --create
-        creates: /run/media
-
     - name: Check versions of crucial packages
-      command: rpm -qa *kernel* *glibc* golang podman conmon containernetworking-plugins containers-common container-selinux crun runc fuse-overlayfs flatpak-session-helper
+      command: rpm -qa *kernel* *glibc* golang podman conmon containernetworking-plugins containers-common container-selinux crun runc fuse-overlayfs flatpak-session-helper patchelf
 
     - name: Show podman versions
       command: podman version
 
     - name: Show podman debug information
       command: podman info --debug
+
+    - name: Set up build directory
+      command: meson builddir
+      args:
+        chdir: '{{ zuul.project.src_dir }}'
+
+    - name: Build Toolbox
+      command: ninja -C builddir
+      args:
+        chdir: '{{ zuul.project.src_dir }}'
+        creates: builddir/src/toolbox
+
+    - name: Install Toolbox
+      become: yes
+      command: ninja -C builddir install
+      args:
+        chdir: '{{ zuul.project.src_dir }}'
+        creates: /usr/local/bin/toolbox
+
+    - name: Setup environment
+      become: yes
+      command:
+        cmd: systemd-tmpfiles --create
+        creates: /run/media
+        creates: /run/host

playbooks/system-test.yaml

@@ -1,32 +1,11 @@
 ---
 - hosts: all
 
-  vars:
-    toolbox_bin: '/usr/local/bin/toolbox'
-
   tasks:
-    - name: Set up build directory
-      command: meson builddir
-      args:
-        chdir: '{{ zuul.project.src_dir }}'
-
-    - name: Build Toolbox
-      command: ninja -C builddir
-      args:
-        chdir: '{{ zuul.project.src_dir }}'
-        creates: builddir/src/toolbox
-
-    - name: Install Toolbox
-      become: yes
-      command: ninja -C builddir install
-      args:
-        chdir: '{{ zuul.project.src_dir }}'
-        creates: '{{ toolbox_bin }}'
-
     - name: Run system tests
       command: bats --timing ./test/system
       environment:
         PODMAN: '/usr/bin/podman'
-        TOOLBOX: '{{ toolbox_bin }}'
+        TOOLBOX: '/usr/local/bin/toolbox'
       args:
         chdir: '{{ zuul.project.src_dir }}'

playbooks/unit-test.yaml

@@ -1,27 +1,6 @@
 ---
 - hosts: all
   tasks:
-    - name: Install requirements
-      become: yes
-      package:
-        name:
-          - golang
-          - golang-github-cpuguy83-md2man
-          - ninja-build
-          - meson
-          - ShellCheck
-
-    - name: Set up build directory
-      command: meson builddir
-      args:
-        chdir: '{{ zuul.project.src_dir }}'
-
-    - name: Build Toolbox
-      command: ninja -C builddir
-      args:
-        chdir: '{{ zuul.project.src_dir }}'
-        creates: builddir/src/toolbox
-
     - name: Test
       command: ninja -C builddir test
       args: