[FIX] Fixes libvirt apparmor and gate jobs

This change refactors the apparmor job to utilize the feature
gates system instead of relying on separate scripts.

Change-Id: I51b36c1972ff3ee8d4366bf2d5027e433721d740
This commit is contained in:
diwakar thyagaraj 2020-01-22 23:40:01 +00:00
parent 0541bdc6b5
commit 6632b114b8
3 changed files with 21 additions and 18 deletions

View File

@ -0,0 +1,5 @@
pod:
mandatory_access_control:
type: apparmor
libvirt-libvirt-default:
libvirt: runtime/default

View File

@ -254,7 +254,6 @@
- ./tools/deployment/network-policy/openstack-exporter.sh
- ./tools/deployment/network-policy/901-test-networkpolicy.sh
- job:
name: openstack-helm-infra-apparmor
parent: openstack-helm-infra-functional
@ -287,6 +286,7 @@
- ./tools/deployment/apparmor/095-nagios.sh
- ./tools/deployment/apparmor/120-openvswitch.sh
- ./tools/deployment/apparmor/130-postgresql.sh
- job:
name: openstack-helm-infra-aio-logging-apparmor
parent: openstack-helm-infra-functional
@ -316,16 +316,14 @@
- ./tools/deployment/osh-infra-logging/070-kibana.sh
- ./tools/deployment/osh-infra-logging/600-kibana-selenium.sh || true
- job:
name: openstack-helm-infra-aio-logging-apparmor
name: openstack-helm-infra-openstack-support-apparmor
parent: openstack-helm-infra-functional
timeout: 7200
pre-run:
- playbooks/osh-infra-upgrade-host.yaml
- playbooks/osh-infra-deploy-selenium.yaml
pre-run: playbooks/osh-infra-upgrade-host.yaml
run: playbooks/osh-infra-gate-runner.yaml
required-projects:
- openstack/openstack-helm
post-run: playbooks/osh-infra-collect-logs.yaml
nodeset: openstack-helm-single-node
vars:
@ -334,17 +332,15 @@
container_distro_version: bionic
feature_gates: apparmor
gate_scripts:
- ./tools/deployment/osh-infra-logging/000-install-packages.sh
- ./tools/deployment/osh-infra-logging/005-deploy-k8s.sh
- ./tools/deployment/osh-infra-logging/010-ingress.sh
- ./tools/deployment/osh-infra-logging/020-ceph.sh
- ./tools/deployment/osh-infra-logging/025-ceph-ns-activate.sh
- ./tools/deployment/osh-infra-logging/030-radosgw-osh-infra.sh
- ./tools/deployment/osh-infra-logging/040-ldap.sh
- ./tools/deployment/osh-infra-logging/050-elasticsearch.sh
- ./tools/deployment/osh-infra-logging/060-fluentd-daemonset.sh
- ./tools/deployment/osh-infra-logging/065-fluentd-deployment.sh
- ./tools/deployment/osh-infra-logging/070-kibana.sh
- ./tools/deployment/openstack-support/000-install-packages.sh
- ./tools/deployment/openstack-support/005-deploy-k8s.sh
- ./tools/deployment/openstack-support/007-namespace-config.sh
- ./tools/deployment/openstack-support/010-ingress.sh
- ./tools/deployment/openstack-support/020-ceph.sh
- ./tools/deployment/openstack-support/025-ceph-ns-activate.sh
- ./tools/deployment/openstack-support/030-rabbitmq.sh
- ./tools/deployment/openstack-support/040-memcached.sh
- ./tools/deployment/openstack-support/050-libvirt.sh
- job:
name: openstack-helm-infra-metacontroller

View File

@ -44,6 +44,8 @@
voting: false
- openstack-helm-infra-aio-logging-apparmor:
voting: false
- openstack-helm-infra-openstack-support-apparmor:
voting: false
- openstack-helm-infra-local-storage:
voting: false
- openstack-helm-infra-metacontroller: