Browse Source

Merge "Remove the unused experimental job"

Zuul 3 months ago
parent
commit
4397025f56

+ 1
- 18
.zuul.yaml View File

@@ -19,9 +19,6 @@
19 19
       queue: murano
20 20
       jobs:
21 21
         - murano-tempest-api
22
-    experimental:
23
-      jobs:
24
-        - murano-functional
25 22
 
26 23
 - job:
27 24
     name: murano-congress-devstack
@@ -96,7 +93,7 @@
96 93
         s-proxy: false
97 94
         tls-proxy: false
98 95
       devstack_localrc:
99
-        TEMPEST_PLUGINS: "'{{ ansible_user_dir }}/src/git.openstack.org/openstack/murano-tempest-plugin'"
96
+        TEMPEST_PLUGINS: "/opt/stack/murano-tempest-plugin"
100 97
       tempest_test_regex: application_catalog
101 98
       tox_envlist: all
102 99
 
@@ -112,17 +109,3 @@
112 109
       devstack_services:
113 110
         murano-cfapi: true
114 111
       tempest_test_regex: service_broker
115
-
116
-- job:
117
-    name: murano-functional
118
-    parent: legacy-dsvm-base
119
-    run: playbooks/legacy/murano-dsvm-functional/run.yaml
120
-    post-run: playbooks/legacy/murano-dsvm-functional/post.yaml
121
-    timeout: 7800
122
-    required-projects:
123
-      - openstack-infra/devstack-gate
124
-      - openstack/heat
125
-      - openstack/murano
126
-      - openstack/murano-dashboard
127
-      - openstack/python-heatclient
128
-      - openstack/python-muranoclient

+ 0
- 80
playbooks/legacy/murano-dsvm-functional/post.yaml View File

@@ -1,80 +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=**/*nose_results.html
13
-          - --include=*/
14
-          - --exclude=*
15
-          - --prune-empty-dirs
16
-
17
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
18
-      synchronize:
19
-        src: '{{ ansible_user_dir }}/workspace/'
20
-        dest: '{{ zuul.executor.log_root }}'
21
-        mode: pull
22
-        copy_links: true
23
-        verify_host: true
24
-        rsync_opts:
25
-          - --include=**/*testr_results.html.gz
26
-          - --include=*/
27
-          - --exclude=*
28
-          - --prune-empty-dirs
29
-
30
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
31
-      synchronize:
32
-        src: '{{ ansible_user_dir }}/workspace/'
33
-        dest: '{{ zuul.executor.log_root }}'
34
-        mode: pull
35
-        copy_links: true
36
-        verify_host: true
37
-        rsync_opts:
38
-          - --include=/.testrepository/tmp*
39
-          - --include=*/
40
-          - --exclude=*
41
-          - --prune-empty-dirs
42
-
43
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
44
-      synchronize:
45
-        src: '{{ ansible_user_dir }}/workspace/'
46
-        dest: '{{ zuul.executor.log_root }}'
47
-        mode: pull
48
-        copy_links: true
49
-        verify_host: true
50
-        rsync_opts:
51
-          - --include=**/*testrepository.subunit.gz
52
-          - --include=*/
53
-          - --exclude=*
54
-          - --prune-empty-dirs
55
-
56
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
57
-      synchronize:
58
-        src: '{{ ansible_user_dir }}/workspace/'
59
-        dest: '{{ zuul.executor.log_root }}/tox'
60
-        mode: pull
61
-        copy_links: true
62
-        verify_host: true
63
-        rsync_opts:
64
-          - --include=/.tox/*/log/*
65
-          - --include=*/
66
-          - --exclude=*
67
-          - --prune-empty-dirs
68
-
69
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
70
-      synchronize:
71
-        src: '{{ ansible_user_dir }}/workspace/'
72
-        dest: '{{ zuul.executor.log_root }}'
73
-        mode: pull
74
-        copy_links: true
75
-        verify_host: true
76
-        rsync_opts:
77
-          - --include=/logs/**
78
-          - --include=*/
79
-          - --exclude=*
80
-          - --prune-empty-dirs

+ 0
- 69
playbooks/legacy/murano-dsvm-functional/run.yaml View File

@@ -1,69 +0,0 @@
1
-- hosts: all
2
-  name: Autoconverted job legacy-murano-dsvm-functional from old job gate-murano-dsvm-functional-ubuntu-xenial
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 murano git://git.openstack.org/openstack/murano
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
-          export DEVSTACK_GATE_TEMPEST=0
46
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
47
-          export DEVSTACK_GATE_NEUTRON=1
48
-
49
-          export PROJECTS="openstack/heat $PROJECTS"
50
-          export PROJECTS="openstack/python-heatclient $PROJECTS"
51
-          export PROJECTS="openstack/murano $PROJECTS"
52
-          export PROJECTS="openstack/murano-dashboard $PROJECTS"
53
-          export PROJECTS="openstack/python-muranoclient $PROJECTS"
54
-
55
-          export BRANCH_OVERRIDE=default
56
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
57
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
58
-          fi
59
-
60
-          function post_test_hook {
61
-              source $BASE/new/murano/functionaltests/post_test_hook_experimental.sh
62
-          }
63
-          export -f post_test_hook
64
-
65
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
66
-          ./safe-devstack-vm-gate-wrap.sh
67
-        executable: /bin/bash
68
-        chdir: '{{ ansible_user_dir }}/workspace'
69
-      environment: '{{ zuul | zuul_legacy_vars }}'

Loading…
Cancel
Save