Address comments from I51adbbdf13711e463b4d25c2ffd4a3123cd65675
- renames the base job that is for dsvm jobs - removes the unused legacy branch override stuff - moves the comment about keeping the jobs sorted Change-Id: Idf20864fe3371e4bbafb8c18bcf979a8f3c3eb62
This commit is contained in:
11
.zuul.yaml
11
.zuul.yaml
@@ -1,10 +1,11 @@
|
|||||||
# See https://docs.openstack.org/infra/manual/drivers.html#naming-with-zuul-v3
|
# See https://docs.openstack.org/infra/manual/drivers.html#naming-with-zuul-v3
|
||||||
# for job naming conventions.
|
# for job naming conventions.
|
||||||
- job:
|
- job:
|
||||||
name: nova-base
|
name: nova-dsvm-base
|
||||||
parent: legacy-dsvm-base
|
parent: legacy-dsvm-base
|
||||||
description: |
|
description: |
|
||||||
The base job definition for nova jobs. Contains common configuration.
|
The base job definition for nova devstack/tempest jobs.
|
||||||
|
Contains common configuration.
|
||||||
timeout: 10800
|
timeout: 10800
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack-infra/devstack-gate
|
- openstack-infra/devstack-gate
|
||||||
@@ -63,7 +64,7 @@
|
|||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: nova-lvm
|
name: nova-lvm
|
||||||
parent: nova-base
|
parent: nova-dsvm-base
|
||||||
description: |
|
description: |
|
||||||
Run standard integration tests using LVM image backend. This is useful if
|
Run standard integration tests using LVM image backend. This is useful if
|
||||||
there are tests touching this code.
|
there are tests touching this code.
|
||||||
@@ -72,7 +73,7 @@
|
|||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: nova-multiattach
|
name: nova-multiattach
|
||||||
parent: nova-base
|
parent: nova-dsvm-base
|
||||||
description: |
|
description: |
|
||||||
Run tempest integration tests with volume multiattach support enabled.
|
Run tempest integration tests with volume multiattach support enabled.
|
||||||
This job will only work starting with Queens.
|
This job will only work starting with Queens.
|
||||||
@@ -86,6 +87,7 @@
|
|||||||
post-run: playbooks/legacy/nova-multiattach/post.yaml
|
post-run: playbooks/legacy/nova-multiattach/post.yaml
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
|
# Please try to keep the list of job names sorted alphabetically.
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- nova-multiattach
|
- nova-multiattach
|
||||||
@@ -98,5 +100,4 @@
|
|||||||
- nova-tox-functional-py35
|
- nova-tox-functional-py35
|
||||||
experimental:
|
experimental:
|
||||||
jobs:
|
jobs:
|
||||||
# Please try to keep this list of job names sorted alphabetically.
|
|
||||||
- nova-lvm
|
- nova-lvm
|
||||||
|
@@ -43,10 +43,6 @@
|
|||||||
set -x
|
set -x
|
||||||
export PYTHONUNBUFFERED=true
|
export PYTHONUNBUFFERED=true
|
||||||
export DEVSTACK_GATE_TEMPEST=1
|
export DEVSTACK_GATE_TEMPEST=1
|
||||||
export BRANCH_OVERRIDE=default
|
|
||||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
|
||||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
|
||||||
fi
|
|
||||||
|
|
||||||
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/nova/devstack/tempest-dsvm-lvm-rc
|
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/nova/devstack/tempest-dsvm-lvm-rc
|
||||||
|
|
||||||
|
@@ -47,10 +47,6 @@
|
|||||||
# Only run compute API tests; note that this will need to
|
# Only run compute API tests; note that this will need to
|
||||||
# be updated if multiattach scenario tests are ever added.
|
# be updated if multiattach scenario tests are ever added.
|
||||||
export DEVSTACK_GATE_TEMPEST_REGEX="api.compute"
|
export DEVSTACK_GATE_TEMPEST_REGEX="api.compute"
|
||||||
export BRANCH_OVERRIDE=default
|
|
||||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
|
||||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
|
||||||
fi
|
|
||||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||||
./safe-devstack-vm-gate-wrap.sh
|
./safe-devstack-vm-gate-wrap.sh
|
||||||
executable: /bin/bash
|
executable: /bin/bash
|
||||||
|
Reference in New Issue
Block a user