From 6027ac0c0c3c4705bdfd83e6330b292768197851 Mon Sep 17 00:00:00 2001 From: Gage Hugo Date: Wed, 8 Jul 2020 10:00:12 -0500 Subject: [PATCH] Cleanup zuul checks This change moves the tungsten fabric check down to the periodic checks with the other feature overrides, removes several duplicate checks that are currently non-functional, and moves the rest to experimental. Also moves the compute-kit jobs back to using the default single-node nodeset due to cloudedge going down and not enough available 32gb nodes as a result Change-Id: Ib4f314d5246af8756611346ed4919492d98510a5 --- zuul.d/jobs-openstack-helm.yaml | 3 +-- zuul.d/project.yaml | 24 +++++------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml index cc0a6af5ff..b029e86d56 100644 --- a/zuul.d/jobs-openstack-helm.yaml +++ b/zuul.d/jobs-openstack-helm.yaml @@ -159,7 +159,6 @@ name: openstack-helm-compute-kit parent: openstack-helm-chart-deploy run: tools/gate/playbooks/osh-gate-runner.yaml - nodeset: openstack-helm-single-32GB-node vars: osh_params: openstack_release: stein @@ -355,7 +354,7 @@ - ./tools/deployment/developer/common/900-use-it.sh - ./tools/deployment/common/test-networkpolicy.sh - job: - name: openstack-helm-tf + name: openstack-helm-tungsten-fabric parent: openstack-helm-compute-kit timeout: 9600 nodeset: openstack-helm-single-32GB-node diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 9def1575eb..459b4c9b13 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -26,13 +26,10 @@ - openstack-helm-lint - openstack-helm-bandit - openstack-helm-cinder - - openstack-helm-cinder-rocky-ubuntu_bionic - openstack-helm-cinder-train-ubuntu_bionic - openstack-helm-compute-kit - - openstack-helm-compute-kit-rocky-ubuntu_bionic - openstack-helm-compute-kit-train-ubuntu_bionic - openstack-helm-horizon - - openstack-helm-tf gate: jobs: - openstack-helm-lint @@ -41,29 +38,16 @@ - openstack-helm-horizon periodic: jobs: - # Keystone job that exercises feature gate - openstack-helm-keystone-ldap - openstack-helm-cinder-ocata-ubuntu_xenial - openstack-helm-cinder-pike-ubuntu_xenial - openstack-helm-cinder-queens-ubuntu_xenial - - openstack-helm-cinder-rocky-ubuntu_xenial + - openstack-helm-cinder-rocky-ubuntu_bionic - openstack-helm-compute-kit-ocata-ubuntu_xenial - openstack-helm-compute-kit-pike-ubuntu_xenial - openstack-helm-compute-kit-queens-ubuntu_xenial - - openstack-helm-compute-kit-rocky-ubuntu_xenial - # TODO: Disabling this until there is proper maintainence to make it - # work properly again - # - openstack-helm-cinder-rocky-opensuse_15 - # - openstack-helm-compute-kit-rocky-opensuse_15 - # - # Unique periodic jobs - # NOTE(srwilkers): Disabling the following jobs until - # issues with the kubeadm-aio based deployments are addressed - # - openstack-helm-multinode-temp-ubuntu - # - openstack-helm-ironic-ubuntu - # - openstack-helm-armada-deploy - # - openstack-helm-armada-update-uuid - # - openstack-helm-armada-update-passwords + - openstack-helm-compute-kit-rocky-ubuntu_bionic + - openstack-helm-tungsten-fabric experimental: jobs: - openstack-helm-apparmor @@ -73,9 +57,11 @@ - openstack-helm-netpol-cinder # NOTE(srwilkers): Disabling the following jobs until # issues with the kubeadm-aio based deployments are addressed + # - openstack-helm-multinode-temp-ubuntu # - openstack-helm-multinode-temp-centos # - openstack-helm-multinode-temp-fedora # - openstack-helm-multinode-temp-tempest # - openstack-helm-armada-deploy # - openstack-helm-armada-update-uuid # - openstack-helm-armada-update-passwords + # - openstack-helm-ironic-ubuntu