summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-10-16 20:00:10 +0000
committerGerrit Code Review <review@openstack.org>2017-10-16 20:00:10 +0000
commit76a38b533dc4905fbca39a4dd1a882ed3f191246 (patch)
treebb6726b3b2350c1119eed8a93771915a743e617f
parenta1a9cad038292e5ba981f5f827b22a9e9a049c6f (diff)
parent23d5c2df9eef03db0832d4ef7f3b7df12b3e29e9 (diff)
Merge "Move legacy jobs to project"
-rw-r--r--.zuul.yaml17
-rwxr-xr-xmixmatch/tests/functional/hooks/dsvm_hook.sh4
-rw-r--r--playbooks/legacy/mixmatch-dsvm-functional/post.yaml15
-rw-r--r--playbooks/legacy/mixmatch-dsvm-functional/run.yaml52
4 files changed, 86 insertions, 2 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..248db18
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,17 @@
1- project:
2 name: openstack/mixmatch
3 check:
4 jobs:
5 - mixmatch-dsvm-functional:
6 voting: false
7
8- job:
9 name: mixmatch-dsvm-functional
10 parent: legacy-dsvm-base
11 run: playbooks/legacy/mixmatch-dsvm-functional/run
12 post-run: playbooks/legacy/mixmatch-dsvm-functional/post
13 timeout: 7800
14 required-projects:
15 - openstack-infra/devstack-gate
16 - openstack/mixmatch
17
diff --git a/mixmatch/tests/functional/hooks/dsvm_hook.sh b/mixmatch/tests/functional/hooks/dsvm_hook.sh
index 12e9e93..3414503 100755
--- a/mixmatch/tests/functional/hooks/dsvm_hook.sh
+++ b/mixmatch/tests/functional/hooks/dsvm_hook.sh
@@ -35,8 +35,8 @@ if [ -d .testrepository ]; then
35 sudo rm -r .testrepository 35 sudo rm -r .testrepository
36fi 36fi
37 37
38sudo chown -R jenkins:stack $BASE/new/tempest 38sudo chown -R $USER:stack $BASE/new/tempest
39sudo chown -R jenkins:stack /opt/stack/data/tempest 39sudo chown -R $USER:stack /opt/stack/data/tempest
40 40
41ostestr -r '(^tempest.api.compute|^tempest.api.image|^tempest.api.volume|^tempest.api.network|^tempest.scenario)' \ 41ostestr -r '(^tempest.api.compute|^tempest.api.image|^tempest.api.volume|^tempest.api.network|^tempest.scenario)' \
42 --blacklist-file $BASE/new/mixmatch/mixmatch/tests/functional/tempest_blacklist.txt 42 --blacklist-file $BASE/new/mixmatch/mixmatch/tests/functional/tempest_blacklist.txt
diff --git a/playbooks/legacy/mixmatch-dsvm-functional/post.yaml b/playbooks/legacy/mixmatch-dsvm-functional/post.yaml
new file mode 100644
index 0000000..e07f551
--- /dev/null
+++ b/playbooks/legacy/mixmatch-dsvm-functional/post.yaml
@@ -0,0 +1,15 @@
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
diff --git a/playbooks/legacy/mixmatch-dsvm-functional/run.yaml b/playbooks/legacy/mixmatch-dsvm-functional/run.yaml
new file mode 100644
index 0000000..0a4c07d
--- /dev/null
+++ b/playbooks/legacy/mixmatch-dsvm-functional/run.yaml
@@ -0,0 +1,52 @@
1- hosts: all
2 name: Autoconverted job legacy-mixmatch-dsvm-functional from old job gate-mixmatch-dsvm-functional-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 export PYTHONUNBUFFERED=true
31 export BRANCH_OVERRIDE=default
32 export PROJECTS="openstack/mixmatch $PROJECTS"
33 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
34 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
35 fi
36
37 export DEVSTACK_LOCAL_CONFIG="enable_plugin mixmatch git://git.openstack.org/openstack/mixmatch"
38
39 export DEVSTACK_GATE_TEMPEST=1
40 export DEVSTACK_GATE_TEMPEST_NOTESTS=1
41
42 function post_test_hook {
43 # Configure and run functional tests
44 $BASE/new/mixmatch/mixmatch/tests/functional/hooks/dsvm_hook.sh
45 }
46 export -f post_test_hook
47
48 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
49 ./safe-devstack-vm-gate-wrap.sh
50 executable: /bin/bash
51 chdir: '{{ ansible_user_dir }}/workspace'
52 environment: '{{ zuul | zuul_legacy_vars }}'