Use override-checkout instead of override-branch

The former also makes sure to use the job definitions from the
respective branch, not only the source code.

Story: #2007282
Task: #38734
Change-Id: Id730b2d6bdd58da1fbe4c5fa24442281d5a69e5b
This commit is contained in:
Dmitry Tantsur 2020-02-11 17:06:06 +01:00
parent 7825e28725
commit e56d02052d
1 changed files with 19 additions and 19 deletions

View File

@ -1,7 +1,7 @@
- job: - job:
name: ironic-standalone-train name: ironic-standalone-train
parent: ironic-standalone parent: ironic-standalone
override-branch: stable/train override-checkout: stable/train
vars: vars:
devstack_localrc: devstack_localrc:
USE_PYTHON3: False USE_PYTHON3: False
@ -9,7 +9,7 @@
- job: - job:
name: ironic-standalone-stein name: ironic-standalone-stein
parent: ironic-standalone parent: ironic-standalone
override-branch: stable/stein override-checkout: stable/stein
vars: vars:
devstack_localrc: devstack_localrc:
USE_PYTHON3: False USE_PYTHON3: False
@ -17,7 +17,7 @@
- job: - job:
name: ironic-dsvm-standalone-rocky name: ironic-dsvm-standalone-rocky
parent: ironic-standalone parent: ironic-standalone
override-branch: stable/rocky override-checkout: stable/rocky
nodeset: openstack-single-node-xenial nodeset: openstack-single-node-xenial
vars: vars:
devstack_localrc: devstack_localrc:
@ -26,7 +26,7 @@
- job: - job:
name: ironic-dsvm-standalone-queens name: ironic-dsvm-standalone-queens
parent: ironic-standalone parent: ironic-standalone
override-branch: stable/queens override-checkout: stable/queens
nodeset: openstack-single-node-xenial nodeset: openstack-single-node-xenial
vars: vars:
devstack_localrc: devstack_localrc:
@ -38,17 +38,17 @@
- job: - job:
name: ironic-tempest-functional-python3-train name: ironic-tempest-functional-python3-train
parent: ironic-tempest-functional-python3 parent: ironic-tempest-functional-python3
override-branch: stable/train override-checkout: stable/train
- job: - job:
name: ironic-tempest-functional-python3-stein name: ironic-tempest-functional-python3-stein
parent: ironic-tempest-functional-python3 parent: ironic-tempest-functional-python3
override-branch: stable/stein override-checkout: stable/stein
- job: - job:
name: ironic-tempest-dsvm-functional-python3-rocky name: ironic-tempest-dsvm-functional-python3-rocky
parent: ironic-tempest-functional-python3 parent: ironic-tempest-functional-python3
override-branch: stable/rocky override-checkout: stable/rocky
nodeset: openstack-single-node-xenial nodeset: openstack-single-node-xenial
vars: vars:
devstack_localrc: devstack_localrc:
@ -59,7 +59,7 @@
- job: - job:
name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-train name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-train
parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
override-branch: stable/train override-checkout: stable/train
vars: vars:
devstack_localrc: devstack_localrc:
USE_PYTHON3: False USE_PYTHON3: False
@ -67,7 +67,7 @@
- job: - job:
name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-stein name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-stein
parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
override-branch: stable/stein override-checkout: stable/stein
vars: vars:
devstack_localrc: devstack_localrc:
USE_PYTHON3: False USE_PYTHON3: False
@ -75,7 +75,7 @@
- job: - job:
name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-rocky name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-rocky
parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
override-branch: stable/rocky override-checkout: stable/rocky
nodeset: openstack-two-node-xenial nodeset: openstack-two-node-xenial
vars: vars:
devstack_localrc: devstack_localrc:
@ -94,7 +94,7 @@
- job: - job:
name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-queens name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-queens
parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
override-branch: stable/queens override-checkout: stable/queens
nodeset: openstack-two-node-xenial nodeset: openstack-two-node-xenial
vars: vars:
devstack_localrc: devstack_localrc:
@ -113,7 +113,7 @@
- job: - job:
name: ironic-inspector-tempest-train name: ironic-inspector-tempest-train
parent: ironic-inspector-tempest parent: ironic-inspector-tempest
override-branch: stable/train override-checkout: stable/train
vars: vars:
devstack_localrc: devstack_localrc:
FIXED_NETWORK_SIZE: 4096 FIXED_NETWORK_SIZE: 4096
@ -123,7 +123,7 @@
- job: - job:
name: ironic-inspector-tempest-stein name: ironic-inspector-tempest-stein
parent: ironic-inspector-tempest parent: ironic-inspector-tempest
override-branch: stable/stein override-checkout: stable/stein
vars: vars:
devstack_localrc: devstack_localrc:
FIXED_NETWORK_SIZE: 4096 FIXED_NETWORK_SIZE: 4096
@ -133,7 +133,7 @@
- job: - job:
name: ironic-tempest-dsvm-ironic-inspector-rocky name: ironic-tempest-dsvm-ironic-inspector-rocky
parent: ironic-inspector-tempest parent: ironic-inspector-tempest
override-branch: stable/rocky override-checkout: stable/rocky
nodeset: openstack-single-node-xenial nodeset: openstack-single-node-xenial
vars: vars:
devstack_localrc: devstack_localrc:
@ -144,7 +144,7 @@
- job: - job:
name: ironic-tempest-dsvm-ironic-inspector-queens name: ironic-tempest-dsvm-ironic-inspector-queens
parent: ironic-inspector-tempest parent: ironic-inspector-tempest
override-branch: stable/queens override-checkout: stable/queens
nodeset: openstack-single-node-xenial nodeset: openstack-single-node-xenial
vars: vars:
devstack_localrc: devstack_localrc:
@ -155,7 +155,7 @@
- job: - job:
name: ironic-inspector-tempest-discovery-train name: ironic-inspector-tempest-discovery-train
parent: ironic-inspector-tempest-discovery parent: ironic-inspector-tempest-discovery
override-branch: stable/train override-checkout: stable/train
vars: vars:
devstack_localrc: devstack_localrc:
USE_PYTHON3: False USE_PYTHON3: False
@ -163,7 +163,7 @@
- job: - job:
name: ironic-inspector-tempest-discovery-stein name: ironic-inspector-tempest-discovery-stein
parent: ironic-inspector-tempest-discovery parent: ironic-inspector-tempest-discovery
override-branch: stable/stein override-checkout: stable/stein
vars: vars:
devstack_localrc: devstack_localrc:
USE_PYTHON3: False USE_PYTHON3: False
@ -171,7 +171,7 @@
- job: - job:
name: ironic-inspector-tempest-dsvm-discovery-rocky name: ironic-inspector-tempest-dsvm-discovery-rocky
parent: ironic-inspector-tempest-discovery parent: ironic-inspector-tempest-discovery
override-branch: stable/rocky override-checkout: stable/rocky
nodeset: openstack-single-node-xenial nodeset: openstack-single-node-xenial
vars: vars:
devstack_localrc: devstack_localrc:
@ -180,7 +180,7 @@
- job: - job:
name: ironic-inspector-tempest-dsvm-discovery-queens name: ironic-inspector-tempest-dsvm-discovery-queens
parent: ironic-inspector-tempest-discovery parent: ironic-inspector-tempest-discovery
override-branch: stable/queens override-checkout: stable/queens
nodeset: openstack-single-node-xenial nodeset: openstack-single-node-xenial
vars: vars:
devstack_localrc: devstack_localrc: