summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-06-15 14:32:16 +0000
committerGerrit Code Review <review@openstack.org>2018-06-15 14:32:16 +0000
commitb04735dcdda1cceb92177ae181a7acd8439b21d0 (patch)
tree929bd3487e8090b9788b44472b5db2860a66c874
parente0bce59cf26d105e37bb3a8a077dea18d28224b2 (diff)
parent6f0e1732170ef2357eb85989c3ee0cae857b45c6 (diff)
Merge "Remove glance legacy job"
-rw-r--r--playbooks/legacy/barbican-simple-crypto-dsvm-tempest-glance/post.yaml15
-rw-r--r--playbooks/legacy/barbican-simple-crypto-dsvm-tempest-glance/run.yaml73
-rw-r--r--zuul.d/zuul-legacy-jobs.yaml16
3 files changed, 0 insertions, 104 deletions
diff --git a/playbooks/legacy/barbican-simple-crypto-dsvm-tempest-glance/post.yaml b/playbooks/legacy/barbican-simple-crypto-dsvm-tempest-glance/post.yaml
deleted file mode 100644
index e07f551..0000000
--- a/playbooks/legacy/barbican-simple-crypto-dsvm-tempest-glance/post.yaml
+++ /dev/null
@@ -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
diff --git a/playbooks/legacy/barbican-simple-crypto-dsvm-tempest-glance/run.yaml b/playbooks/legacy/barbican-simple-crypto-dsvm-tempest-glance/run.yaml
deleted file mode 100644
index 5e05bdc..0000000
--- a/playbooks/legacy/barbican-simple-crypto-dsvm-tempest-glance/run.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
1- hosts: all
2 name: Autoconverted job legacy-barbican-simple-crypto-dsvm-tempest-glance from old
3 job gate-barbican-simple-crypto-dsvm-tempest-glance-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 export PYTHONUNBUFFERED=true
32 export DEVSTACK_GATE_TEMPEST=1
33 export DEVSTACK_GATE_TEMPEST_REGEX=barbican
34 export KEEP_LOCALRC=1
35
36 export PROJECTS="openstack/barbican $PROJECTS"
37 export PROJECTS="openstack/python-barbicanclient $PROJECTS"
38 export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
39 export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican git://git.openstack.org/openstack/barbican"
40 export DEVSTACK_LOCAL_CONFIG+=$'\n'"export TEMPEST_PLUGINS='/opt/stack/new/barbican-tempest-plugin'"
41
42 export BRANCH_OVERRIDE=default
43 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
44 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
45 fi
46 # Add configuration values for enabling security features in local.conf
47 function pre_test_hook {
48 if [ -f $BASE/new/barbican-tempest-plugin/tools/pre_test_hook.sh ] ; then
49 . $BASE/new/barbican-tempest-plugin/tools/pre_test_hook.sh
50 fi
51 }
52 export -f pre_test_hook
53
54 if [ "-glance" == "-postgres" ] ; then
55 export DEVSTACK_GATE_POSTGRES=1
56 elif [ "-glance" == "-castellan-from-git" ] ; then
57 export DEVSTACK_PROJECT_FROM_GIT="castellan"
58 elif [ "-glance" == "-cursive" ] ; then
59 export DEVSTACK_PROJECT_FROM_GIT="cursive"
60 elif [ "-glance" == "-py35" ] ; then
61 export DEVSTACK_GATE_USE_PYTHON3=True
62 export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account"
63 export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container"
64 export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-object"
65 export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-proxy"
66 fi
67
68 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
69
70 ./safe-devstack-vm-gate-wrap.sh
71 executable: /bin/bash
72 chdir: '{{ ansible_user_dir }}/workspace'
73 environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml
index 2f804c4..212953b 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -12,22 +12,6 @@
12 timeout: 1800 12 timeout: 1800
13 13
14- job: 14- job:
15 name: legacy-barbican-simple-crypto-dsvm-tempest-glance
16 parent: legacy-dsvm-base
17 run: playbooks/legacy/barbican-simple-crypto-dsvm-tempest-glance/run.yaml
18 post-run: playbooks/legacy/barbican-simple-crypto-dsvm-tempest-glance/post.yaml
19 timeout: 4200
20 required-projects:
21 - openstack-infra/devstack-gate
22 - openstack/barbican
23 - openstack/barbican-tempest-plugin
24 - openstack/castellan
25 - openstack/cursive
26 - openstack/glance
27 - openstack/python-barbicanclient
28 - openstack/tempest
29
30- job:
31 name: legacy-barbican-simple-crypto-dsvm-tempest-nova 15 name: legacy-barbican-simple-crypto-dsvm-tempest-nova
32 parent: legacy-dsvm-base 16 parent: legacy-dsvm-base
33 run: playbooks/legacy/barbican-simple-crypto-dsvm-tempest-nova/run.yaml 17 run: playbooks/legacy/barbican-simple-crypto-dsvm-tempest-nova/run.yaml