Merge "Add CI jobs for Train stable branches"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index bcedbc3..2d91e2c 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,22 +7,30 @@
jobs:
# NOTE(dtantsur): keep N-3 and older non-voting for these jobs.
- ironic-standalone
+ - ironic-standalone-train
- ironic-standalone-stein
- - ironic-dsvm-standalone-rocky
+ - ironic-dsvm-standalone-rocky:
+ voting: false
- ironic-dsvm-standalone-queens:
voting: false
- ironic-tempest-functional-python3
+ - ironic-tempest-functional-python3-train
- ironic-tempest-functional-python3-stein
- - ironic-tempest-dsvm-functional-python3-rocky
+ - ironic-tempest-dsvm-functional-python3-rocky:
+ voting: false
- ironic-inspector-tempest
+ - ironic-inspector-tempest-train
- ironic-inspector-tempest-stein
- - ironic-tempest-dsvm-ironic-inspector-rocky
+ - ironic-tempest-dsvm-ironic-inspector-rocky:
+ voting: false
- 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 they used to pass
- ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
+ - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-train:
+ voting: false
- ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-stein:
voting: false
- ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-rocky:
@@ -30,6 +38,8 @@
- ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-queens:
voting: false
- ironic-inspector-tempest-discovery
+ - ironic-inspector-tempest-discovery-train:
+ voting: false
- ironic-inspector-tempest-discovery-stein:
voting: false
- ironic-inspector-tempest-dsvm-discovery-rocky:
@@ -40,13 +50,13 @@
queue: ironic
jobs:
- ironic-standalone
+ - ironic-standalone-train
- ironic-standalone-stein
- - ironic-dsvm-standalone-rocky
- ironic-tempest-functional-python3
+ - ironic-tempest-functional-python3-train
- ironic-tempest-functional-python3-stein
- - ironic-tempest-dsvm-functional-python3-rocky
- ironic-inspector-tempest
+ - ironic-inspector-tempest-train
- ironic-inspector-tempest-stein
- - ironic-tempest-dsvm-ironic-inspector-rocky
- 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 f553787..48246df 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -1,4 +1,9 @@
- job:
+ name: ironic-standalone-train
+ parent: ironic-standalone
+ override-branch: stable/train
+
+- job:
name: ironic-standalone-stein
parent: ironic-standalone
override-branch: stable/stein
@@ -21,6 +26,11 @@
IRONIC_USE_MOD_WSGI: True
- job:
+ name: ironic-tempest-functional-python3-train
+ parent: ironic-tempest-functional-python3
+ override-branch: stable/train
+
+- job:
name: ironic-tempest-functional-python3-stein
parent: ironic-tempest-functional-python3
override-branch: stable/stein
@@ -37,6 +47,11 @@
rabbit: True
- job:
+ name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-train
+ parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
+ override-branch: stable/train
+
+- job:
name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-stein
parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
override-branch: stable/stein
@@ -78,6 +93,15 @@
OVS_BRIDGE_MAPPINGS: 'mynetwork:sub1brbm,public:br_ironic_vxlan'
- job:
+ name: ironic-inspector-tempest-train
+ parent: ironic-inspector-tempest
+ override-branch: stable/train
+ vars:
+ devstack_localrc:
+ FIXED_NETWORK_SIZE: 4096
+ EBTABLES_RACE_FIX: True
+
+- job:
name: ironic-inspector-tempest-stein
parent: ironic-inspector-tempest
override-branch: stable/stein
@@ -107,6 +131,11 @@
EBTABLES_RACE_FIX: True
- job:
+ name: ironic-inspector-tempest-discovery-train
+ parent: ironic-inspector-tempest-discovery
+ override-branch: stable/train
+
+- job:
name: ironic-inspector-tempest-discovery-stein
parent: ironic-inspector-tempest-discovery
override-branch: stable/stein