Merge "Install apparmor when installing podman"

playbooks/roles/install-docker/tasks/Ubuntu.noble.yaml

@@ -18,6 +18,10 @@
       # TODO do we need these extra tools?
       - buildah
       - skopeo
+      # Production nodes have apparmor but CI nodes don't. List it
+      # explicitly here to resolve the delta. The old docker upstream
+      # install path also installed apparmor.
+      - apparmor
     state: present
 
 - name: Disable docker daemon service

playbooks/zuul/run-base-post.yaml

@@ -25,6 +25,11 @@
       - docker
       - podman
 
+    - name: Get AppArmor Status
+      shell: 'apparmor_status | tee /var/log/apparmor_status'
+      become: yes
+      failed_when: false
+
     - include_role:
         name: stage-output
 

testinfra/test_zuul_lb.py

@@ -32,10 +32,3 @@ def test_haproxy_statsd_running(host):
     out = json.loads(cmd.stdout)
     assert out[0]["State"]["Status"] == "running"
     assert out[0]["RestartCount"] == 0
-
-def test_haproxy_logging(host):
-    # rsyslog is configured to add a unix socket at this path
-    assert host.file('/var/lib/haproxy/dev/log').is_socket
-    # Haproxy logs to syslog via the above socket which produces
-    # this logfile
-    assert host.file('/var/log/haproxy.log').is_file

zuul.d/system-config-run.yaml

@@ -13,6 +13,7 @@
       zuul_copy_output: "{{ copy_output | combine(host_copy_output | default({})) }}"
       stage_dir: "{{ ansible_user_dir }}/zuul-output"
       copy_output:
+        '/var/log/apparmor_status': logs_txt
         '/var/log/syslog': logs_txt
         '/var/log/messages': logs_txt
         '/var/log/exim4': logs