Skip to content

Commit 161c79f

Browse files
author
Dean Troyer
committed
Move more jobs in-repo
Now consume the merged openstackclient-plugin-jobs template in openstack/openstackclient repo. Change-Id: I60f2c8ad443c802e13de8f185647faa68e07bfe2
1 parent c901620 commit 161c79f

5 files changed

Lines changed: 373 additions & 0 deletions

File tree

‎.zuul.yaml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# from zuul.d/zuul-legacy-jobs.yaml legacy-osc-dsvm-functional
2+
23
- job:
34
name: osc-functional-devstack
45
parent: legacy-dsvm-base
@@ -9,11 +10,48 @@
910
- openstack-infra/devstack-gate
1011
- openstack/python-openstackclient
1112

13+
- job:
14+
name: osc-functional-devstack-n-net
15+
parent: legacy-dsvm-base
16+
run: playbooks/osc-functional-devstack-n-net/run
17+
post-run: playbooks/osc-functional-devstack-n-net/post
18+
timeout: 7800
19+
required-projects:
20+
- openstack-infra/devstack-gate
21+
- openstack/python-openstackclient
22+
23+
- job:
24+
name: osc-functional-devstack-tips
25+
parent: legacy-dsvm-base
26+
run: playbooks/osc-functional-devstack-tips/run
27+
post-run: playbooks/osc-functional-devstack-tips/post
28+
timeout: 7800
29+
required-projects:
30+
- openstack-infra/devstack-gate
31+
- openstack/os-client-config
32+
- openstack/osc-lib
33+
- openstack/python-openstackclient
34+
- openstack/python-openstacksdk
35+
36+
1237
- project:
1338
name: openstack/python-openstackclient
39+
templates:
40+
- openstackclient-plugin-jobs
1441
check:
1542
jobs:
1643
- osc-functional-devstack
44+
- osc-functional-devstack-n-net:
45+
voting: false
46+
# The job testing nova-network no longer works before Pike, and
47+
# should be disabled until the New Way of testing against old clouds
48+
# is ready and backported
49+
branches: ^(?!stable/(newton|ocata)).*$
50+
- osc-functional-devstack-tips:
51+
voting: false
52+
# The functional-tips job only tests the latest and shouldn't be run
53+
# on the stable branches
54+
branches: ^(?!stable)
1755
gate:
1856
jobs:
1957
- osc-functional-devstack

‎playbooks/osc-functional-devstack-n-net/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/osc-functional-devstack-n-net/run.yaml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
- hosts: all
2+
name: Autoconverted job legacy-osc-dsvm-functional-n-net from old job gate-osc-dsvm-functional-n-net-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+
# NOTE(RuiChen): nova-network only can be enable in nova cell v1
33+
enable_service n-net n-cell
34+
disable_service neutron q-svc q-agt q-dhcp q-l3 q-meta q-metering
35+
# NOTE(dtroyer): OSC needs to support Image v1 for a while yet so re-enable
36+
GLANCE_V1_ENABLED=True
37+
# NOTE(dtroyer): Functional tests need a bit more volume headroom
38+
VOLUME_BACKING_FILE_SIZE=20G
39+
# NOTE(dtroyer): OSC needs to support Volume v1 for a while yet so re-enable
40+
[[post-config|$CINDER_CONF]]
41+
[DEFAULT]
42+
enable_v1_api = True
43+
44+
EOF
45+
executable: /bin/bash
46+
chdir: '{{ ansible_user_dir }}/workspace'
47+
environment: '{{ zuul | zuul_legacy_vars }}'
48+
49+
- shell:
50+
cmd: |
51+
set -e
52+
set -x
53+
export PYTHONUNBUFFERED=true
54+
export DEVSTACK_GATE_UNSTACK=0
55+
export DEVSTACK_GATE_TEMPEST=0
56+
export DEVSTACK_GATE_EXERCISES=0
57+
export DEVSTACK_GATE_INSTALL_TESTONLY=1
58+
# NOTE(RuiChen): Explicitly tell devstack-gate that we need to run
59+
# the nova-network job with cell v1.
60+
export DEVSTACK_GATE_NEUTRON=0
61+
export DEVSTACK_GATE_CELLS=1
62+
export BRANCH_OVERRIDE=default
63+
export DEVSTACK_PROJECT_FROM_GIT=python-openstackclient
64+
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
65+
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
66+
fi
67+
68+
function post_test_hook {
69+
# NOTE(stevemar): After the newton release was tagged the file was moved.
70+
# But, we run functional tests for various stable releases
71+
# (mitaka, and newton).
72+
# TODO(stevemar): Remove this check when Newton hits EOL.
73+
hook_location=$BASE/new/python-openstackclient/openstackclient/tests/functional/post_test_hook.sh
74+
if [ ! -f "$hook_location" ]; then
75+
hook_location=$BASE/new/python-openstackclient/post_test_hook.sh
76+
fi
77+
bash -xe $hook_location
78+
}
79+
export -f post_test_hook
80+
81+
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
82+
./safe-devstack-vm-gate-wrap.sh
83+
executable: /bin/bash
84+
chdir: '{{ ansible_user_dir }}/workspace'
85+
environment: '{{ zuul | zuul_legacy_vars }}'

‎playbooks/osc-functional-devstack-tips/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/osc-functional-devstack-tips/run.yaml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
- hosts: all
2+
name: Autoconverted job legacy-osc-dsvm-functional-tips from old job gate-osc-dsvm-functional-tips-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+
# NOTE(amotoki): Some neutron features are enabled by devstack plugin
33+
enable_plugin neutron https://git.openstack.org/openstack/neutron
34+
enable_service q-qos
35+
enable_service neutron-segments
36+
# NOTE(dtroyer): OSC needs to support Image v1 for a while yet so re-enable
37+
GLANCE_V1_ENABLED=True
38+
# NOTE(dtroyer): Functional tests need a bit more volume headroom
39+
VOLUME_BACKING_FILE_SIZE=20G
40+
# Swift is not ready for python3 yet: At a minimum keystonemiddleware needs
41+
# to be installed in the py2 env, there are probably other things too...
42+
disable_service s-account
43+
disable_service s-container
44+
disable_service s-object
45+
disable_service s-proxy
46+
# This is insufficient, but leaving it here as a reminder of what may
47+
# someday be all we need to make this work
48+
disable_python3_package swift
49+
# NOTE(dtroyer): OSC needs to support Volume v1 for a while yet so re-enable
50+
[[post-config|$CINDER_CONF]]
51+
[DEFAULT]
52+
enable_v1_api = True
53+
54+
EOF
55+
executable: /bin/bash
56+
chdir: '{{ ansible_user_dir }}/workspace'
57+
environment: '{{ zuul | zuul_legacy_vars }}'
58+
59+
- shell:
60+
cmd: |
61+
set -e
62+
set -x
63+
export PYTHONUNBUFFERED=true
64+
export DEVSTACK_GATE_USE_PYTHON3=True
65+
export DEVSTACK_GATE_UNSTACK=0
66+
export DEVSTACK_GATE_TEMPEST=0
67+
export DEVSTACK_GATE_EXERCISES=0
68+
export DEVSTACK_GATE_INSTALL_TESTONLY=1
69+
export DEVSTACK_GATE_NEUTRON=1
70+
export BRANCH_OVERRIDE=default
71+
export DEVSTACK_PROJECT_FROM_GIT="python-openstackclient,python-openstacksdk,osc-lib,os-client-config"
72+
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
73+
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
74+
fi
75+
76+
function post_test_hook {
77+
# This test hook will install the master version of the following:
78+
# - osc-lib
79+
# - openstacksdk
80+
# - os-client-config
81+
hook_location=$BASE/new/python-openstackclient/openstackclient/tests/functional/post_test_hook_tips.sh
82+
bash -xe $hook_location
83+
}
84+
export -f post_test_hook
85+
86+
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
87+
./safe-devstack-vm-gate-wrap.sh
88+
executable: /bin/bash
89+
chdir: '{{ ansible_user_dir }}/workspace'
90+
environment: '{{ zuul | zuul_legacy_vars }}'

0 commit comments

Comments
 (0)