Consolidate apparmor check jobs

There was an additional job added for checking libvirt's apparmor
profiles separately from the standard apparmor job that existed
previously. This adds the libvirt deployment to the previously
existing apparmor job and removes the apparmor-libvirt job.

Change-Id: I76b00f1e5dca4236f62150e4ac48b0777a05b29f

zuul.d/jobs.yaml

@@ -209,20 +209,6 @@
         - ./tools/deployment/apparmor/001-setup-apparmor-profiles.sh
         - ./tools/deployment/apparmor/005-deploy-k8s.sh
         - ./tools/deployment/apparmor/040-memcached.sh
-
-- job:
-    name: openstack-helm-infra-apparmor-libvirt
-    parent: openstack-helm-infra-functional
-    timeout: 7200
-    pre-run: playbooks/osh-infra-upgrade-host.yaml
-    run: playbooks/osh-infra-gate-runner.yaml
-    post-run: playbooks/osh-infra-collect-logs.yaml
-    nodeset: openstack-helm-single-node
-    vars:
-      gate_scripts:
-        - ./tools/deployment/apparmor/000-install-packages.sh
-        - ./tools/deployment/apparmor/001-setup-apparmor-profiles.sh
-        - ./tools/deployment/apparmor/005-deploy-k8s.sh
         - ./tools/deployment/apparmor/050-libvirt.sh
 
 - job:
@@ -404,4 +390,3 @@
         - ./tools/deployment/podsecuritypolicy/005-deploy-k8s.sh
         - ./tools/deployment/podsecuritypolicy/006-config-k8s-psp.sh
         - ./tools/deployment/podsecuritypolicy/007-podsecuritypolicy.sh
-

zuul.d/project.yaml

@@ -33,8 +33,6 @@
             voting: false
         - openstack-helm-infra-apparmor:
             voting: false
-        - openstack-helm-infra-apparmor-libvirt:
-            voting: false
     gate:
       jobs:
         - openstack-helm-lint