Browse Source

use the old vitrage-tempest-plugin

Change-Id: I5277325fd36594cc2662d44c652afd2e68347d80
Depends-On: https://review.opendev.org/#/c/747903/
changes/19/747919/3
Eyal 1 month ago
parent
commit
a082a9351d
8 changed files with 47 additions and 50 deletions
  1. +3
    -0
      .zuul.yaml
  2. +1
    -1
      devstack/devstackgaterc
  3. +7
    -8
      playbooks/legacy/vitrage-dsvm-api-py27/run.yaml
  4. +7
    -8
      playbooks/legacy/vitrage-dsvm-api-py3/run.yaml
  5. +7
    -8
      playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml
  6. +7
    -8
      playbooks/legacy/vitrage-dsvm-datasources-py3/run.yaml
  7. +7
    -8
      playbooks/legacy/vitrage-dsvm-mock-py27/run.yaml
  8. +8
    -9
      playbooks/legacy/vitrage-dsvm-mock-py3/run.yaml

+ 3
- 0
.zuul.yaml View File

@@ -27,6 +27,7 @@
- job:
name: vitrage-dsvm-api-py27
parent: legacy-dsvm-base
voting: false
run: playbooks/legacy/vitrage-dsvm-api-py27/run.yaml
post-run: playbooks/legacy/vitrage-dsvm-api-py27/post.yaml
timeout: 7800
@@ -63,6 +64,7 @@
- job:
name: vitrage-dsvm-datasources-py27
parent: legacy-dsvm-base
voting: false
run: playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml
post-run: playbooks/legacy/vitrage-dsvm-datasources-py27/post.yaml
timeout: 7800
@@ -133,6 +135,7 @@
- job:
name: grenade-vitrage
parent: legacy-dsvm-base
voting: false
run: playbooks/legacy/vitrage-grenade/run.yaml
post-run: playbooks/legacy/vitrage-grenade/post.yaml
timeout: 7800


+ 1
- 1
devstack/devstackgaterc View File

@@ -1 +1 @@
export TEMPEST_VERSION=master
export TEMPEST_VERSION=5.0.0

+ 7
- 8
playbooks/legacy/vitrage-dsvm-api-py27/run.yaml View File

@@ -37,6 +37,13 @@
export DEVSTACK_GATE_USE_PYTHON3=False

function pre_test_hook {
if [[ "$TEMPEST_VERSION" != "master" ]]; then
# use vitrage-tempest-plugin $TEMPEST_VERSION
# which is defined in the devstackgaterc file

cd $BASE/new/vitrage-tempest-plugin/
git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION
fi
source $BASE/new/vitrage-tempest-plugin/devstack/pre_test_hook.sh
}
export -f pre_test_hook
@@ -47,14 +54,6 @@
export -f gate_hook

function post_test_hook {
if [[ "$TEMPEST_VERSION" != "master" ]]; then
# use vitrage-tempest-plugin $TEMPEST_VERSION
# which is defined in the devstackgaterc file

cd $BASE/new/vitrage-tempest-plugin/
git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION
fi

source $BASE/new/vitrage-tempest-plugin/devstack/post_test_hook.sh 'api'
}
export -f post_test_hook


+ 7
- 8
playbooks/legacy/vitrage-dsvm-api-py3/run.yaml View File

@@ -37,6 +37,13 @@
export DEVSTACK_GATE_USE_PYTHON3=True

function pre_test_hook {
if [[ "$TEMPEST_VERSION" != "master" ]]; then
# use vitrage-tempest-plugin $TEMPEST_VERSION
# which is defined in the devstackgaterc file

cd $BASE/new/vitrage-tempest-plugin/
git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION
fi
source $BASE/new/vitrage-tempest-plugin/devstack/pre_test_hook.sh
}
export -f pre_test_hook
@@ -47,14 +54,6 @@
export -f gate_hook

function post_test_hook {
if [[ "$TEMPEST_VERSION" != "master" ]]; then
# use vitrage-tempest-plugin $TEMPEST_VERSION
# which is defined in the devstackgaterc file

cd $BASE/new/vitrage-tempest-plugin/
git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION
fi

source $BASE/new/vitrage-tempest-plugin/devstack/post_test_hook.sh 'api'
}
export -f post_test_hook


+ 7
- 8
playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml View File

@@ -37,6 +37,13 @@
export DEVSTACK_GATE_USE_PYTHON3=False

function pre_test_hook {
if [[ "$TEMPEST_VERSION" != "master" ]]; then
# use vitrage-tempest-plugin $TEMPEST_VERSION
# which is defined in the devstackgaterc file

cd $BASE/new/vitrage-tempest-plugin/
git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION
fi
source $BASE/new/vitrage-tempest-plugin/devstack/pre_test_hook.sh
}
export -f pre_test_hook
@@ -47,14 +54,6 @@
export -f gate_hook

function post_test_hook {
if [[ "$TEMPEST_VERSION" != "master" ]]; then
# use vitrage-tempest-plugin $TEMPEST_VERSION
# which is defined in the devstackgaterc file

cd $BASE/new/vitrage-tempest-plugin/
git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION
fi

source $BASE/new/vitrage-tempest-plugin/devstack/post_test_hook.sh 'datasources'
}
export -f post_test_hook


+ 7
- 8
playbooks/legacy/vitrage-dsvm-datasources-py3/run.yaml View File

@@ -37,6 +37,13 @@
export DEVSTACK_GATE_USE_PYTHON3=True

function pre_test_hook {
if [[ "$TEMPEST_VERSION" != "master" ]]; then
# use vitrage-tempest-plugin $TEMPEST_VERSION
# which is defined in the devstackgaterc file

cd $BASE/new/vitrage-tempest-plugin/
git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION
fi
source $BASE/new/vitrage-tempest-plugin/devstack/pre_test_hook.sh
}
export -f pre_test_hook
@@ -47,14 +54,6 @@
export -f gate_hook

function post_test_hook {
if [[ "$TEMPEST_VERSION" != "master" ]]; then
# use vitrage-tempest-plugin $TEMPEST_VERSION
# which is defined in the devstackgaterc file

cd $BASE/new/vitrage-tempest-plugin/
git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION
fi

source $BASE/new/vitrage-tempest-plugin/devstack/post_test_hook.sh 'datasources'
}
export -f post_test_hook


+ 7
- 8
playbooks/legacy/vitrage-dsvm-mock-py27/run.yaml View File

@@ -35,6 +35,13 @@
export DEVSTACK_GATE_USE_PYTHON3=False

function pre_test_hook {
if [[ "$TEMPEST_VERSION" != "master" ]]; then
# use vitrage-tempest-plugin $TEMPEST_VERSION
# which is defined in the devstackgaterc file

cd $BASE/new/vitrage-tempest-plugin/
git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION
fi
source $BASE/new/vitrage-tempest-plugin/devstack/pre_test_hook.sh
}
export -f pre_test_hook
@@ -45,14 +52,6 @@
export -f gate_hook

function post_test_hook {
if [[ "$TEMPEST_VERSION" != "master" ]]; then
# use vitrage-tempest-plugin $TEMPEST_VERSION
# which is defined in the devstackgaterc file

cd $BASE/new/vitrage-tempest-plugin/
git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION
fi

source $BASE/new/vitrage-tempest-plugin/devstack/post_test_hook.sh 'mock'
}
export -f post_test_hook


+ 8
- 9
playbooks/legacy/vitrage-dsvm-mock-py3/run.yaml View File

@@ -35,6 +35,13 @@
export DEVSTACK_GATE_USE_PYTHON3=True

function pre_test_hook {
if [[ "$TEMPEST_VERSION" != "master" ]]; then
# use vitrage-tempest-plugin $TEMPEST_VERSION
# which is defined in the devstackgaterc file

cd $BASE/new/vitrage-tempest-plugin/
git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION
fi
source $BASE/new/vitrage-tempest-plugin/devstack/pre_test_hook.sh
}
export -f pre_test_hook
@@ -45,19 +52,11 @@
export -f gate_hook

function post_test_hook {
if [[ "$TEMPEST_VERSION" != "master" ]]; then
# use vitrage-tempest-plugin $TEMPEST_VERSION
# which is defined in the devstackgaterc file

cd $BASE/new/vitrage-tempest-plugin/
git_checkout_tag vitrage-tempest-plugin $TEMPEST_VERSION
fi

source $BASE/new/vitrage-tempest-plugin/devstack/post_test_hook.sh 'mock'
}
export -f post_test_hook

export DEVSTACK_GATE_SETTINGS=$BASE/new/vitrage/devstack/devstackgaterc
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/vitrage/devstack/devstackgaterc

cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh


Loading…
Cancel
Save