summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhurong <aaronzhu1121@gmail.com>2017-12-02 13:39:36 +0800
committerzhurong <aaronzhu1121@gmail.com>2017-12-06 14:48:39 +0800
commit05d95df793530c6957b597fa1a9d67b5a1c7be23 (patch)
tree9e754874b4b63424ee37735b987e2392d01fa6b8
parent0e9dbd13bc323734fe8e5516a93991a863e01bfa (diff)
Murano tempest job with separate tempest plugin
Notes
Notes (review): Code-Review+2: Felipe Monteiro <felipe.monteiro@att.com> Code-Review+2: zhurong <aaronzhu1121@gmail.com> Workflow+1: zhurong <aaronzhu1121@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 07 Dec 2017 01:33:37 +0000 Reviewed-on: https://review.openstack.org/524787 Project: openstack/murano Branch: refs/heads/master
-rw-r--r--.zuul.yaml41
-rwxr-xr-xdevstack/plugin.sh4
-rw-r--r--playbooks/legacy/tempest-dsvm-murano-api/run.yaml20
-rw-r--r--playbooks/legacy/tempest-dsvm-murano-cfapi/run.yaml20
4 files changed, 56 insertions, 29 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 4974ee8..7c6c4fd 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,25 +2,13 @@
2 name: openstack/murano 2 name: openstack/murano
3 check: 3 check:
4 jobs: 4 jobs:
5 - murano-congress-devstack-dsvm: 5 - murano-congress-devstack-dsvm
6 voting: false 6 - rally-dsvm-murano-task
7 - rally-dsvm-murano-task: 7 - tempest-dsvm-murano-api
8 voting: false 8 - tempest-dsvm-murano-cfapi
9 - tempest-dsvm-murano-api:
10 irrelevant-files:
11 - ^(test-|)requirements.txt$
12 - ^setup.cfg$
13 - tempest-dsvm-murano-cfapi:
14 voting: false
15 irrelevant-files:
16 - ^(test-|)requirements.txt$
17 - ^setup.cfg$
18 gate: 9 gate:
19 jobs: 10 jobs:
20 - tempest-dsvm-murano-api: 11 - tempest-dsvm-murano-api
21 irrelevant-files:
22 - ^(test-|)requirements.txt$
23 - ^setup.cfg$
24 experimental: 12 experimental:
25 jobs: 13 jobs:
26 - murano-dsvm-functional 14 - murano-dsvm-functional
@@ -30,6 +18,7 @@
30 parent: legacy-dsvm-base 18 parent: legacy-dsvm-base
31 run: playbooks/legacy/murano-congress-devstack-dsvm/run.yaml 19 run: playbooks/legacy/murano-congress-devstack-dsvm/run.yaml
32 post-run: playbooks/legacy/murano-congress-devstack-dsvm/post.yaml 20 post-run: playbooks/legacy/murano-congress-devstack-dsvm/post.yaml
21 voting: false
33 timeout: 4200 22 timeout: 4200
34 required-projects: 23 required-projects:
35 - openstack-dev/devstack 24 - openstack-dev/devstack
@@ -51,6 +40,7 @@
51 parent: legacy-dsvm-base 40 parent: legacy-dsvm-base
52 run: playbooks/legacy/rally-dsvm-murano-task/run.yaml 41 run: playbooks/legacy/rally-dsvm-murano-task/run.yaml
53 post-run: playbooks/legacy/rally-dsvm-murano-task/post.yaml 42 post-run: playbooks/legacy/rally-dsvm-murano-task/post.yaml
43 voting: false
54 timeout: 7800 44 timeout: 7800
55 required-projects: 45 required-projects:
56 - openstack-infra/devstack-gate 46 - openstack-infra/devstack-gate
@@ -66,6 +56,13 @@
66 parent: legacy-dsvm-base 56 parent: legacy-dsvm-base
67 run: playbooks/legacy/tempest-dsvm-murano-api/run.yaml 57 run: playbooks/legacy/tempest-dsvm-murano-api/run.yaml
68 post-run: playbooks/legacy/tempest-dsvm-murano-api/post.yaml 58 post-run: playbooks/legacy/tempest-dsvm-murano-api/post.yaml
59 irrelevant-files:
60 - ^(test-|)requirements.txt$
61 - ^setup.cfg$
62 - ^doc/.*$
63 - ^.*\.rst$
64 - ^releasenotes/.*$
65 - ^murano/tests/.*$
69 timeout: 7800 66 timeout: 7800
70 required-projects: 67 required-projects:
71 - openstack-infra/devstack-gate 68 - openstack-infra/devstack-gate
@@ -75,12 +72,21 @@
75 - openstack/python-heatclient 72 - openstack/python-heatclient
76 - openstack/python-muranoclient 73 - openstack/python-muranoclient
77 - openstack/tempest 74 - openstack/tempest
75 - openstack/murano-tempest-plugin
78 76
79- job: 77- job:
80 name: tempest-dsvm-murano-cfapi 78 name: tempest-dsvm-murano-cfapi
81 parent: legacy-dsvm-base 79 parent: legacy-dsvm-base
82 run: playbooks/legacy/tempest-dsvm-murano-cfapi/run.yaml 80 run: playbooks/legacy/tempest-dsvm-murano-cfapi/run.yaml
83 post-run: playbooks/legacy/tempest-dsvm-murano-cfapi/post.yaml 81 post-run: playbooks/legacy/tempest-dsvm-murano-cfapi/post.yaml
82 voting: false
83 irrelevant-files:
84 - ^(test-|)requirements.txt$
85 - ^setup.cfg$
86 - ^doc/.*$
87 - ^.*\.rst$
88 - ^releasenotes/.*$
89 - ^murano/tests/.*$
84 timeout: 7800 90 timeout: 7800
85 required-projects: 91 required-projects:
86 - openstack-infra/devstack-gate 92 - openstack-infra/devstack-gate
@@ -90,6 +96,7 @@
90 - openstack/python-heatclient 96 - openstack/python-heatclient
91 - openstack/python-muranoclient 97 - openstack/python-muranoclient
92 - openstack/tempest 98 - openstack/tempest
99 - openstack/murano-tempest-plugin
93 100
94- job: 101- job:
95 name: murano-dsvm-functional 102 name: murano-dsvm-functional
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 22592e9..953d9cb 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -452,10 +452,6 @@ function configure_murano_tempest_plugin() {
452 echo_summary "Configuring Murano Tempest plugin" 452 echo_summary "Configuring Murano Tempest plugin"
453 # Set murano service availability flag 453 # Set murano service availability flag
454 iniset $TEMPEST_CONFIG service_available murano "True" 454 iniset $TEMPEST_CONFIG service_available murano "True"
455 # Running tempest in isolation will using tempest user.
456 if sudo id -u tempest >/dev/null 2>&1; then
457 sudo chown -R tempest:stack $MURANO_DIR/murano_tempest_tests
458 fi
459 if is_service_enabled murano-cfapi; then 455 if is_service_enabled murano-cfapi; then
460 # Enable Service Broker tests if cfapi enabled and set murano-cfapi service availability flag 456 # Enable Service Broker tests if cfapi enabled and set murano-cfapi service availability flag
461 iniset $TEMPEST_CONFIG service_available murano_cfapi "True" 457 iniset $TEMPEST_CONFIG service_available murano_cfapi "True"
diff --git a/playbooks/legacy/tempest-dsvm-murano-api/run.yaml b/playbooks/legacy/tempest-dsvm-murano-api/run.yaml
index 92820c9..a6c3512 100644
--- a/playbooks/legacy/tempest-dsvm-murano-api/run.yaml
+++ b/playbooks/legacy/tempest-dsvm-murano-api/run.yaml
@@ -27,18 +27,30 @@
27 cmd: | 27 cmd: |
28 set -e 28 set -e
29 set -x 29 set -x
30 cat << 'EOF' >>"/tmp/dg-local.conf"
31 [[local|localrc]]
32 TEMPEST_PLUGINS='/opt/stack/new/murano-tempest-plugin'
33 enable_plugin heat git://git.openstack.org/openstack/heat
34 enable_plugin murano git://git.openstack.org/openstack/murano
35 EOF
36 executable: /bin/bash
37 chdir: '{{ ansible_user_dir }}/workspace'
38 environment: '{{ zuul | zuul_legacy_vars }}'
39
40 - shell:
41 cmd: |
42 set -e
43 set -x
30 export PYTHONUNBUFFERED=true 44 export PYTHONUNBUFFERED=true
31 export DEVSTACK_GATE_TEMPEST=1 45 export DEVSTACK_GATE_TEMPEST=1
32 export DEVSTACK_GATE_NEUTRON=1 46 export DEVSTACK_GATE_NEUTRON=1
33 # Allow tempest to use site-packages with plugins 47 export ENABLED_SERVICES=tempest
34 export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
35 export PROJECTS="openstack/heat $PROJECTS" 48 export PROJECTS="openstack/heat $PROJECTS"
36 export PROJECTS="openstack/python-heatclient $PROJECTS" 49 export PROJECTS="openstack/python-heatclient $PROJECTS"
37 export PROJECTS="openstack/murano $PROJECTS" 50 export PROJECTS="openstack/murano $PROJECTS"
38 export PROJECTS="openstack/murano-dashboard $PROJECTS" 51 export PROJECTS="openstack/murano-dashboard $PROJECTS"
39 export PROJECTS="openstack/python-muranoclient $PROJECTS" 52 export PROJECTS="openstack/python-muranoclient $PROJECTS"
40 export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat" 53 export PROJECTS="openstack/murano-tempest-plugin $PROJECTS"
41 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin murano git://git.openstack.org/openstack/murano"
42 export BRANCH_OVERRIDE=default 54 export BRANCH_OVERRIDE=default
43 if [ "$BRANCH_OVERRIDE" != "default" ] ; then 55 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
44 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE 56 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
diff --git a/playbooks/legacy/tempest-dsvm-murano-cfapi/run.yaml b/playbooks/legacy/tempest-dsvm-murano-cfapi/run.yaml
index cd84422..2718de0 100644
--- a/playbooks/legacy/tempest-dsvm-murano-cfapi/run.yaml
+++ b/playbooks/legacy/tempest-dsvm-murano-cfapi/run.yaml
@@ -27,18 +27,30 @@
27 cmd: | 27 cmd: |
28 set -e 28 set -e
29 set -x 29 set -x
30 cat << 'EOF' >>"/tmp/dg-local.conf"
31 [[local|localrc]]
32 TEMPEST_PLUGINS='/opt/stack/new/murano-tempest-plugin'
33 enable_plugin heat git://git.openstack.org/openstack/heat
34 enable_plugin murano git://git.openstack.org/openstack/murano
35 EOF
36 executable: /bin/bash
37 chdir: '{{ ansible_user_dir }}/workspace'
38 environment: '{{ zuul | zuul_legacy_vars }}'
39
40 - shell:
41 cmd: |
42 set -e
43 set -x
30 export PYTHONUNBUFFERED=true 44 export PYTHONUNBUFFERED=true
31 export DEVSTACK_GATE_TEMPEST=1 45 export DEVSTACK_GATE_TEMPEST=1
32 export DEVSTACK_GATE_NEUTRON=1 46 export DEVSTACK_GATE_NEUTRON=1
33 # Allow tempest to use site-packages with plugins 47 export ENABLED_SERVICES=tempest
34 export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
35 export PROJECTS="openstack/heat $PROJECTS" 48 export PROJECTS="openstack/heat $PROJECTS"
36 export PROJECTS="openstack/python-heatclient $PROJECTS" 49 export PROJECTS="openstack/python-heatclient $PROJECTS"
37 export PROJECTS="openstack/murano $PROJECTS" 50 export PROJECTS="openstack/murano $PROJECTS"
38 export PROJECTS="openstack/murano-dashboard $PROJECTS" 51 export PROJECTS="openstack/murano-dashboard $PROJECTS"
39 export PROJECTS="openstack/python-muranoclient $PROJECTS" 52 export PROJECTS="openstack/python-muranoclient $PROJECTS"
40 export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat" 53 export PROJECTS="openstack/murano-tempest-plugin $PROJECTS"
41 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin murano git://git.openstack.org/openstack/murano"
42 export BRANCH_OVERRIDE=default 54 export BRANCH_OVERRIDE=default
43 if [ "$BRANCH_OVERRIDE" != "default" ] ; then 55 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
44 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE 56 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE