Browse Source

Merge "murano-congress-devstack job use native Zuulv3"

Zuul 8 months ago
parent
commit
edb1158565

+ 10
- 8
.zuul.yaml View File

@@ -16,9 +16,7 @@
16 16
 
17 17
 - job:
18 18
     name: murano-congress-devstack
19
-    parent: legacy-dsvm-base
20
-    run: playbooks/legacy/murano-congress-devstack-dsvm/run.yaml
21
-    post-run: playbooks/legacy/murano-congress-devstack-dsvm/post.yaml
19
+    parent: murano-tempest-base
22 20
     voting: false
23 21
     timeout: 4200
24 22
     irrelevant-files:
@@ -29,19 +27,23 @@
29 27
       - ^releasenotes/.*$
30 28
       - ^murano/tests/.*$
31 29
     required-projects:
32
-      - openstack-dev/devstack
33
-      - openstack-infra/devstack-gate
34 30
       - openstack/congress
35 31
       - openstack/congress-dashboard
36
-      - openstack/heat
37 32
       - openstack/mistral
38 33
       - openstack/mistral-dashboard
39
-      - openstack/murano
40
-      - openstack/murano-dashboard
41 34
       - openstack/python-congressclient
42 35
       - openstack/python-heatclient
43 36
       - openstack/python-mistralclient
44 37
       - openstack/python-muranoclient
38
+    vars:
39
+      devstack_services:
40
+        tls-proxy: false
41
+      devstack_localrc:
42
+        MURANO_ENABLE_MODEL_POLICY_ENFORCEMENT: True
43
+      devstack_plugins:
44
+        congress: https://git.openstack.org/openstack/congress
45
+        mistral: https://git.openstack.org/openstack/mistral
46
+      tempest_test_regex: functional
45 47
 
46 48
 - job:
47 49
     name: murano-rally-task

+ 0
- 15
playbooks/legacy/murano-congress-devstack-dsvm/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
- 84
playbooks/legacy/murano-congress-devstack-dsvm/run.yaml View File

@@ -1,84 +0,0 @@
1
-- hosts: all
2
-  name: Autoconverted job legacy-murano-congress-devstack-dsvm from old job gate-murano-congress-devstack-dsvm-ubuntu-xenial-nv
3
-  tasks:
4
-
5
-    - name: Ensure legacy workspace directory
6
-      file:
7
-        path: '{{ ansible_user_dir }}/workspace'
8
-        state: directory
9
-
10
-    - shell:
11
-        cmd: |
12
-          set -e
13
-          set -x
14
-          cat > clonemap.yaml << EOF
15
-          clonemap:
16
-            - name: openstack-infra/devstack-gate
17
-              dest: devstack-gate
18
-          EOF
19
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
20
-              git://git.openstack.org \
21
-              openstack-infra/devstack-gate
22
-        executable: /bin/bash
23
-        chdir: '{{ ansible_user_dir }}/workspace'
24
-      environment: '{{ zuul | zuul_legacy_vars }}'
25
-
26
-    - shell:
27
-        cmd: |
28
-          set -e
29
-          set -x
30
-          cat << 'EOF' >>"/tmp/dg-local.conf"
31
-          [[local|localrc]]
32
-          enable_plugin heat git://git.openstack.org/openstack/heat
33
-          enable_plugin mistral git://git.openstack.org/openstack/mistral
34
-          enable_plugin congress git://git.openstack.org/openstack/congress
35
-          MURANO_ENABLE_MODEL_POLICY_ENFORCEMENT=True
36
-          enable_plugin murano git://git.openstack.org/openstack/murano
37
-
38
-          EOF
39
-        executable: /bin/bash
40
-        chdir: '{{ ansible_user_dir }}/workspace'
41
-      environment: '{{ zuul | zuul_legacy_vars }}'
42
-
43
-    - shell:
44
-        cmd: |
45
-          set -e
46
-          set -x
47
-          export PYTHONUNBUFFERED=true
48
-          export DEVSTACK_GATE_NEUTRON=1
49
-          export ENABLED_SERVICES=tempest
50
-          export PROJECTS="openstack/heat $PROJECTS"
51
-          export PROJECTS="openstack/python-heatclient $PROJECTS"
52
-          export PROJECTS="openstack/murano $PROJECTS"
53
-          export PROJECTS="openstack/murano-dashboard $PROJECTS"
54
-          export PROJECTS="openstack/python-muranoclient $PROJECTS"
55
-          export PROJECTS="openstack/congress $PROJECTS"
56
-          export PROJECTS="openstack/python-congressclient $PROJECTS"
57
-          export PROJECTS="openstack/congress-dashboard $PROJECTS"
58
-          export PROJECTS="openstack/mistral $PROJECTS"
59
-          export PROJECTS="openstack/mistral-dashboard $PROJECTS"
60
-          export PROJECTS="openstack/python-mistralclient $PROJECTS"
61
-          export KEEP_LOCALRC=1
62
-
63
-          # Enable murano devstack plugin. Provided repo should be cloned by zuul before devstack run
64
-          # and below provided link should not be used.
65
-
66
-          function pre_test_hook {
67
-              cd /opt/stack/new/murano/functionaltests
68
-              ./pre_test_hook_congress.sh
69
-              ./pre_test_hook_mistral.sh
70
-              ./pre_test_hook.sh
71
-          }
72
-          export -f pre_test_hook
73
-
74
-          function post_test_hook {
75
-              cd /opt/stack/new/murano/functionaltests
76
-              ./post_test_hook.sh congress_mistral
77
-          }
78
-          export -f post_test_hook
79
-
80
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
81
-          ./safe-devstack-vm-gate-wrap.sh
82
-        executable: /bin/bash
83
-        chdir: '{{ ansible_user_dir }}/workspace'
84
-      environment: '{{ zuul | zuul_legacy_vars }}'

Loading…
Cancel
Save