Browse Source

Reconfigure tempest configuration

Switch tempest test to zuul3 native, and add proper configuration  
for events tempest test.


Story: 2004549
Task: 28303
Depends-On: https://review.openstack.org/599575

Change-Id: If630fc2e13ed4a81bb7b74c4238d1e28c78490d7
Adrian Czarnecki 4 months ago
parent
commit
e86c6fbc65

+ 45
- 6
.zuul.yaml View File

@@ -1,17 +1,52 @@
1 1
 - job:
2
-    name: monascaevents-tempest-events-base
3
-    parent: legacy-dsvm-base
4
-    run: playbooks/legacy/monasca-tempest-events-base/run.yaml
5
-    post-run: playbooks/legacy/monasca-tempest-events-base/post.yaml
2
+    name: monasca-events-tempest-base
3
+    parent: devstack-tempest
6 4
     timeout: 7800
7 5
     required-projects:
8 6
       - openstack-infra/devstack-gate
9 7
       - openstack/monasca-events-api
8
+      - openstack/monasca-agent
9
+      - openstack/monasca-api
10 10
       - openstack/monasca-common
11
+      - openstack/monasca-grafana-datasource
12
+      - openstack/monasca-notification
11 13
       - openstack/monasca-persister
14
+      - openstack/monasca-statsd
15
+      - openstack/monasca-thresh
16
+      - openstack/monasca-ui
12 17
       - openstack/python-monascaclient
18
+      - openstack/monasca-kibana-plugin
13 19
       - openstack/tempest
14
-    voting: false
20
+      - openstack/monasca-tempest-plugin
21
+      - openstack/monasca-log-api
22
+    vars:
23
+      tox_envlist: all
24
+      tempest_test_regex: monasca_tempest_tests.tests.event_api
25
+      devstack_plugins:
26
+        monasca-api: git://git.openstack.org/openstack/monasca-api
27
+        monasca-log-api: git://git.openstack.org/openstack/monasca-log-api
28
+        monasca-events-api: git://git.openstack.org/openstack/monasca-events-api
29
+        monasca-tempest-plugin: git://git.openstack.org/openstack/monasca-tempest-plugin
30
+    irrelevant-files:
31
+      - ^.*\.rst$
32
+      - ^.*\.md$
33
+      - ^doc/.*$
34
+      - ^releasenotes/.*$
35
+
36
+- job:
37
+    name: monasca-events-python2
38
+    parent: monasca-events-tempest-base
39
+    vars:
40
+      devstack_localrc:
41
+        TEMPEST_PLUGINS: /opt/stack/monasca-tempest-plugin
42
+
43
+- job:
44
+    name: monasca-events-python3
45
+    parent: monasca-events-tempest-base
46
+    vars:
47
+      devstack_localrc:
48
+        USE_PYTHON3: true
49
+        TEMPEST_PLUGINS: /opt/stack/monasca-tempest-plugin
15 50
 
16 51
 - project:
17 52
     templates:
@@ -25,6 +60,10 @@
25 60
       - release-notes-jobs-python3
26 61
     check:
27 62
       jobs:
28
-        - monascaevents-tempest-events-base
63
+        - monasca-events-python2
64
+        - monasca-events-python3
29 65
     gate:
30 66
       queue: monasca
67
+      jobs:
68
+        - monasca-events-python2
69
+        - monasca-events-python3

+ 1
- 1
devstack/lib/elasticsearch.sh View File

@@ -34,4 +34,4 @@ function configure_elasticsearch {
34 34
     fi
35 35
 }
36 36
 
37
-$_XTRACE_ELASTICSEARCH
37
+$_XTRACE_ELASTICSEARCH

+ 0
- 15
playbooks/legacy/monasca-tempest-events-base/post.yaml View File

@@ -1,15 +0,0 @@
1
-- hosts: primary
2
-  tasks:
3
-
4
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
5
-      synchronize:
6
-        src: '{{ ansible_user_dir }}/workspace/'
7
-        dest: '{{ zuul.executor.log_root }}'
8
-        mode: pull
9
-        copy_links: true
10
-        verify_host: true
11
-        rsync_opts:
12
-          - --include=/logs/**
13
-          - --include=*/
14
-          - --exclude=*
15
-          - --prune-empty-dirs

+ 0
- 72
playbooks/legacy/monasca-tempest-events-base/run.yaml View File

@@ -1,72 +0,0 @@
1
-- hosts: all
2
-  name: Autoconverted job legacy-tempest-dsvm-monasca-python-mysql-full from old job
3
-    gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-xenial-nv
4
-  tasks:
5
-
6
-    - name: Ensure legacy workspace directory
7
-      file:
8
-        path: '{{ ansible_user_dir }}/workspace'
9
-        state: directory
10
-
11
-    - shell:
12
-        cmd: |
13
-          set -e
14
-          set -x
15
-          cat > clonemap.yaml << EOF
16
-          clonemap:
17
-            - name: openstack-infra/devstack-gate
18
-              dest: devstack-gate
19
-          EOF
20
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
21
-              git://git.openstack.org \
22
-              openstack-infra/devstack-gate
23
-        executable: /bin/bash
24
-        chdir: '{{ ansible_user_dir }}/workspace'
25
-      environment: '{{ zuul | zuul_legacy_vars }}'
26
-
27
-    - shell:
28
-        cmd: |
29
-          set -e
30
-          set -x
31
-          cat << 'EOF' >>"/tmp/dg-local.conf"
32
-          [[local|localrc]]
33
-          enable_plugin monasca-events-api git://git.openstack.org/openstack/monasca-events-api
34
-
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
44
-          export PYTHONUNBUFFERED=true
45
-
46
-          export ENABLED_SERVICES=tempest
47
-
48
-          export DEVSTACK_GATE_NEUTRON=1
49
-          export DEVSTACK_GATE_EXERCISES=0
50
-          export DEVSTACK_GATE_POSTGRES=0
51
-
52
-          export PROJECTS="openstack/monasca-events-api $PROJECTS"
53
-          export PROJECTS="openstack/monasca-persister $PROJECTS"
54
-          export PROJECTS="openstack/monasca-common $PROJECTS"
55
-          export PROJECTS="openstack/python-monascaclient $PROJECTS"
56
-
57
-          function pre_test_hook {
58
-              source $BASE/new/monasca-events-api/monasca_events_api/tests/functional/contrib/gate_hook.sh
59
-          }
60
-          export -f pre_test_hook
61
-
62
-          function post_test_hook {
63
-              # Configure and run tempest on monasca-api installation
64
-              source $BASE/new/monasca-events-api/monasca_events_api/tests/functional/contrib/post_test_hook.sh
65
-          }
66
-          export -f post_test_hook
67
-
68
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
69
-          ./safe-devstack-vm-gate-wrap.sh
70
-        executable: /bin/bash
71
-        chdir: '{{ ansible_user_dir }}/workspace'
72
-      environment: '{{ zuul | zuul_legacy_vars }}'

Loading…
Cancel
Save