Merge "Remove Pike jobs and make Queens non-voting"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 2c6dce8..1254ed0 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -8,47 +8,36 @@
# NOTE(dtantsur): keep N-3 and older non-voting for these jobs.
- ironic-standalone
- ironic-dsvm-standalone-rocky
- # NOTE(iurygregory): we want to make voting again
- ironic-dsvm-standalone-queens:
voting: false
- - ironic-dsvm-standalone-pike:
- voting: false
- ironic-tempest-functional-python3
- ironic-tempest-dsvm-functional-python3-rocky
- ironic-inspector-tempest
- ironic-tempest-dsvm-ironic-inspector-rocky
- - ironic-tempest-dsvm-ironic-inspector-queens
- - ironic-tempest-dsvm-ironic-inspector-pike:
+ - ironic-tempest-dsvm-ironic-inspector-queens:
voting: false
# NOTE(dtantsur): these jobs cover rarely changed tests and are quite
# unstable, so keep them non-voting on stable branches.
# NOTE(iurygregory): debug rocky and queens
- # since before was working, pike was broken before
+ # since before was working
- ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
- ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-rocky:
voting: false
- ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-queens:
voting: false
- - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-pike:
- voting: false
- ironic-inspector-tempest-discovery
- ironic-inspector-tempest-dsvm-discovery-rocky:
voting: false
- ironic-inspector-tempest-dsvm-discovery-queens:
voting: false
- # NOTE(iurygregory): we may want to debug why its failling since before was green
- - ironic-inspector-tempest-dsvm-discovery-pike:
- voting: false
gate:
queue: ironic
jobs:
- # NOTE(iurygregory): re add ironic-dsvm-standalone-queens when is green again
- ironic-standalone
- ironic-dsvm-standalone-rocky
- ironic-tempest-functional-python3
- ironic-tempest-dsvm-functional-python3-rocky
- ironic-inspector-tempest
- ironic-tempest-dsvm-ironic-inspector-rocky
- - ironic-tempest-dsvm-ironic-inspector-queens
- ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
- ironic-inspector-tempest-discovery
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index e4cf069..ab6fd03 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -15,13 +15,6 @@
EBTABLES_RACE_FIX: True
IRONIC_USE_MOD_WSGI: True
-
-- job:
- name: ironic-dsvm-standalone-pike
- parent: ironic-standalone
- override-branch: stable/pike
- nodeset: openstack-single-node-xenial
-
- job:
name: ironic-tempest-dsvm-functional-python3-rocky
parent: ironic-tempest-functional-python3
@@ -70,24 +63,6 @@
OVS_BRIDGE_MAPPINGS: 'mynetwork:sub1brbm,public:br_ironic_vxlan'
- job:
- name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-pike
- parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
- override-branch: stable/pike
- nodeset: openstack-two-node-xenial
- vars:
- devstack_localrc:
- IRONIC_DEFAULT_BOOT_OPTION: netboot
- FIXED_NETWORK_SIZE: 4096
- IRONIC_DEFAULT_RESCUE_INTERFACE: agent
- EBTABLES_RACE_FIX: True
- PUBLIC_BRIDGE: br_ironic_vxlan
- OVS_BRIDGE_MAPPINGS: 'mynetwork:brbm,public:br_ironic_vxlan'
- group-vars:
- subnode:
- devstack_localrc:
- OVS_BRIDGE_MAPPINGS: 'mynetwork:sub1brbm,public:br_ironic_vxlan'
-
-- job:
name: ironic-tempest-dsvm-ironic-inspector-rocky
parent: ironic-inspector-tempest
override-branch: stable/rocky
@@ -108,16 +83,6 @@
EBTABLES_RACE_FIX: True
- job:
- name: ironic-tempest-dsvm-ironic-inspector-pike
- parent: ironic-inspector-tempest
- override-branch: stable/pike
- nodeset: openstack-single-node-xenial
- vars:
- devstack_localrc:
- FIXED_NETWORK_SIZE: 4096
- EBTABLES_RACE_FIX: True
-
-- job:
name: ironic-inspector-tempest-dsvm-discovery-rocky
parent: ironic-inspector-tempest-discovery
override-branch: stable/rocky
@@ -128,9 +93,3 @@
parent: ironic-inspector-tempest-discovery
override-branch: stable/queens
nodeset: openstack-single-node-xenial
-
-- job:
- name: ironic-inspector-tempest-dsvm-discovery-pike
- parent: ironic-inspector-tempest-discovery
- override-branch: stable/pike
- nodeset: openstack-single-node-xenial