Fix the scenario parent job to use the live base
The dsvm scenario jobs was using "octavia-dsvm-base" parent job and
not the required "octavia-dsvm-live-base" job. This patch corrects that.
It also changes the "octavia-v2-dsvm-scenario-centos.7" job name to
"octavia-v2-dsvm-scenario-centos-7" to comply with the naming guideline[1].
The same change is applied to the bionic job, which becomes "-bionic".
It also increases the job timeout for "live" jobs to 9,000 seconds, or
2.5 hours to accomidate tcg gate hosts.
[1] https://docs.openstack.org/infra/manual/ \
drivers.html#consistent-naming-for-jobs-with-zuul-v3
Change-Id: I7aaa86bf0a626cbef17611445d4499969741534d
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index e6e2701..d1414b1 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -51,6 +51,7 @@
- job:
name: octavia-dsvm-live-base
parent: octavia-dsvm-base
+ timeout: 9000
required-projects:
- openstack/barbican
- openstack/diskimage-builder
@@ -107,7 +108,7 @@
- job:
name: octavia-v2-dsvm-scenario
- parent: octavia-dsvm-base
+ parent: octavia-dsvm-live-base
vars:
devstack_local_conf:
post-config:
@@ -125,7 +126,7 @@
devstack_localrc:
USE_PYTHON3: true
- job:
- name: octavia-v2-dsvm-scenario-centos.7
+ name: octavia-v2-dsvm-scenario-centos-7
parent: octavia-v2-dsvm-scenario
nodeset: devstack-single-node-centos-7
vars:
@@ -135,7 +136,7 @@
OCTAVIA_AMP_IMAGE_SIZE: 3
- job:
- name: octavia-v2-dsvm-scenario-ubuntu.bionic
+ name: octavia-v2-dsvm-scenario-ubuntu-bionic
parent: octavia-v2-dsvm-scenario
vars:
devstack_localrc: