diff options
| author | Matt Riedemann <mriedem.os@gmail.com> | 2018-02-06 16:53:36 -0500 |
|---|---|---|
| committer | Matt Riedemann <mriedem.os@gmail.com> | 2018-02-06 16:53:36 -0500 |
| commit | a84e7ae506cbe72bbf13589d3573acf4cbfd9af8 (patch) | |
| tree | b9dde3a6666a3920d17287fb77fe238651bba5ca /playbooks | |
| parent | 593e73fb8730ff2a039cd782c3985bd1b954682a (diff) | |
| download | nova-a84e7ae506cbe72bbf13589d3573acf4cbfd9af8.tar.gz | |
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
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/legacy/nova-lvm/run.yaml | 4 | ||||
| -rw-r--r-- | playbooks/legacy/nova-multiattach/run.yaml | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/playbooks/legacy/nova-lvm/run.yaml b/playbooks/legacy/nova-lvm/run.yaml index 5b032b2378..4f9ff00b2d 100644 --- a/playbooks/legacy/nova-lvm/run.yaml +++ b/playbooks/legacy/nova-lvm/run.yaml @@ -43,10 +43,6 @@ set -x export PYTHONUNBUFFERED=true 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 diff --git a/playbooks/legacy/nova-multiattach/run.yaml b/playbooks/legacy/nova-multiattach/run.yaml index 66131722e3..bf96cb555b 100644 --- a/playbooks/legacy/nova-multiattach/run.yaml +++ b/playbooks/legacy/nova-multiattach/run.yaml @@ -47,10 +47,6 @@ # Only run compute API tests; note that this will need to # be updated if multiattach scenario tests are ever added. 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 ./safe-devstack-vm-gate-wrap.sh executable: /bin/bash |