Skip to content

Commit ae16e76

Browse files
gmaanosgmaanos
committed
Move zuulv3 jobs to project repo
This patch moves the zuulv3 jobs for python novaclient. Needed-By: I1508933ef77669754adf8032fc3d835960f78cb7 Needed-By: I37b02be0aeffc3a0f0516616b5294444012b8dea Change-Id: I43a8435485751748ca6228f67d401945cb32652e
1 parent 2e2317b commit ae16e76

File tree

5 files changed

+310
-0
lines changed

5 files changed

+310
-0
lines changed

‎.zuul.yaml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
- job:
2+
name: novaclient-dsvm-functional-identity-v3-only
3+
parent: legacy-dsvm-base
4+
run: playbooks/legacy/novaclient-dsvm-functional-identity-v3-only/run.yaml
5+
post-run: playbooks/legacy/novaclient-dsvm-functional-identity-v3-only/post.yaml
6+
timeout: 7200
7+
voting: false
8+
required-projects:
9+
- openstack-infra/devstack-gate
10+
- openstack/nova
11+
- openstack/python-novaclient
12+
13+
- job:
14+
name: novaclient-dsvm-functional-neutron
15+
parent: legacy-dsvm-base
16+
run: playbooks/legacy/novaclient-dsvm-functional-neutron/run.yaml
17+
post-run: playbooks/legacy/novaclient-dsvm-functional-neutron/post.yaml
18+
timeout: 7200
19+
required-projects:
20+
- openstack-infra/devstack-gate
21+
- openstack/neutron
22+
- openstack/nova
23+
- openstack/python-novaclient
24+
25+
- project:
26+
name: openstack/python-novaclient
27+
check:
28+
jobs:
29+
- novaclient-dsvm-functional-identity-v3-only
30+
- novaclient-dsvm-functional-neutron
31+
gate:
32+
jobs:
33+
- novaclient-dsvm-functional-neutron

‎playbooks/legacy/novaclient-dsvm-functional-identity-v3-only/post.yaml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
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

‎playbooks/legacy/novaclient-dsvm-functional-identity-v3-only/run.yaml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
- hosts: all
2+
name: Autoconverted job legacy-novaclient-dsvm-functional-identity-v3-only from
3+
old job gate-novaclient-dsvm-functional-identity-v3-only-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 BRANCH_OVERRIDE=default
33+
export DEVSTACK_PROJECT_FROM_GIT=python-novaclient
34+
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
35+
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
36+
fi
37+
# This ensures that if we set override branch to something
38+
# else, we still take python-novaclient from the zuul branch
39+
# name. So override branch can be 'stable/mitaka' but we can
40+
# test master changes.
41+
uc_project=`echo $DEVSTACK_PROJECT_FROM_GIT | tr [:lower:] [:upper:] | tr '-' '_' | sed 's/[^A-Z_]//'`
42+
export "OVERRIDE_"$uc_project"_PROJECT_BRANCH"=$ZUUL_BRANCH
43+
44+
function post_test_hook {
45+
# Configure and run functional tests
46+
$BASE/new/python-novaclient/novaclient/tests/functional/hooks/post_test_hook.sh
47+
}
48+
if [ "-identity-v3-only" == "-identity-v3-only" ] ; then
49+
export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
50+
elif [ "-identity-v3-only" == "-neutron" ] ; then
51+
export DEVSTACK_GATE_NEUTRON=1
52+
fi
53+
export -f post_test_hook
54+
55+
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
56+
./safe-devstack-vm-gate-wrap.sh
57+
executable: /bin/bash
58+
chdir: '{{ ansible_user_dir }}/workspace'
59+
environment: '{{ zuul | zuul_legacy_vars }}'

‎playbooks/legacy/novaclient-dsvm-functional-neutron/post.yaml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
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

‎playbooks/legacy/novaclient-dsvm-functional-neutron/run.yaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
- hosts: all
2+
name: Autoconverted job legacy-novaclient-dsvm-functional-neutron from old job gate-novaclient-dsvm-functional-neutron-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+
export PYTHONUNBUFFERED=true
31+
export BRANCH_OVERRIDE=default
32+
export DEVSTACK_PROJECT_FROM_GIT=python-novaclient
33+
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
34+
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
35+
fi
36+
# This ensures that if we set override branch to something
37+
# else, we still take python-novaclient from the zuul branch
38+
# name. So override branch can be 'stable/mitaka' but we can
39+
# test master changes.
40+
uc_project=`echo $DEVSTACK_PROJECT_FROM_GIT | tr [:lower:] [:upper:] | tr '-' '_' | sed 's/[^A-Z_]//'`
41+
export "OVERRIDE_"$uc_project"_PROJECT_BRANCH"=$ZUUL_BRANCH
42+
43+
function post_test_hook {
44+
# Configure and run functional tests
45+
$BASE/new/python-novaclient/novaclient/tests/functional/hooks/post_test_hook.sh
46+
}
47+
if [ "-neutron" == "-identity-v3-only" ] ; then
48+
export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
49+
elif [ "-neutron" == "-neutron" ] ; then
50+
export DEVSTACK_GATE_NEUTRON=1
51+
fi
52+
export -f post_test_hook
53+
54+
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
55+
./safe-devstack-vm-gate-wrap.sh
56+
executable: /bin/bash
57+
chdir: '{{ ansible_user_dir }}/workspace'
58+
environment: '{{ zuul | zuul_legacy_vars }}'

0 commit comments

Comments
 (0)