summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuigi Toscano <ltoscano@redhat.com>2018-09-03 19:46:18 +0200
committerLuigi Toscano <ltoscano@redhat.com>2018-09-03 19:46:18 +0200
commit5a3ae85cc1dc92203a4d29ac242b38f58d7dd24a (patch)
treefac0380ff12bb8184fd6c8018bb3bc9ea2db8185
parentb248ef27e475020aa7087e2a8e7d07781d6f437c (diff)
Import the legacy grenade sahara job
While it would have been better to directly use a native Zuul v3 job, the work towards a common grenade job seems to be stalled. Import the job locally and fix some issues: - make sure that the heat_tempest_plugin is loaded correctly, so that the heat upgrade tests work; - bump the starting point from stable/ocata (!) to stable/queens; it will be changed to stable/rocky when grenade supports it; will require additional fixes due to the standalone->uwsgi change. - import lib/apache so that wsgi deployment works. Story: 2001686 Task: 24517 Change-Id: Ia8de2b8286287355e8e9d3f702027aa282ed8282
Notes
Notes (review): Code-Review+2: Telles Mota Vidal Nóbrega <tenobreg@redhat.com> Workflow+1: Telles Mota Vidal Nóbrega <tenobreg@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 04 Sep 2018 01:16:01 +0000 Reviewed-on: https://review.openstack.org/590583 Project: openstack/sahara Branch: refs/heads/master
-rw-r--r--.zuul.yaml31
-rw-r--r--devstack/upgrade/settings14
-rwxr-xr-xdevstack/upgrade/upgrade.sh1
-rw-r--r--playbooks/sahara-grenade/post.yaml15
-rw-r--r--playbooks/sahara-grenade/run.yaml65
5 files changed, 115 insertions, 11 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 4252e07..de8459f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -16,11 +16,7 @@
16 - openstack-tox-lower-constraints 16 - openstack-tox-lower-constraints
17 - openstack-tox-cover: 17 - openstack-tox-cover:
18 voting: false 18 voting: false
19 - legacy-grenade-dsvm-sahara: 19 - sahara-grenade
20 voting: false
21 irrelevant-files:
22 - ^(test-|)requirements.txt$
23 - ^setup.cfg$
24 gate: 20 gate:
25 queue: sahara 21 queue: sahara
26 jobs: 22 jobs:
@@ -39,6 +35,31 @@
39 - openstack-tox-cover 35 - openstack-tox-cover
40 36
41- job: 37- job:
38 name: sahara-grenade
39 parent: legacy-dsvm-base
40 run: playbooks/sahara-grenade/run.yaml
41 post-run: playbooks/sahara-grenade/post.yaml
42 timeout: 10800
43 required-projects:
44 - openstack-dev/grenade
45 - openstack-infra/devstack-gate
46 - openstack/sahara
47 - openstack/python-saharaclient
48 - openstack/heat
49 - openstack/heat-tempest-plugin
50 - openstack/python-heatclient
51 - openstack/sahara-tests
52 irrelevant-files:
53 - ^(test-|)requirements.txt$
54 - ^.*\.rst$
55 - ^doc/.*$
56 - ^sahara/locale/.*$
57 - ^sahara/tests/unit/.*$
58 - ^releasenotes/.*$
59 - ^tools/.*$
60 - ^tox.ini$
61
62- job:
42 name: sahara-buildimages-base 63 name: sahara-buildimages-base
43 nodeset: centos-7 64 nodeset: centos-7
44 run: playbooks/buildimages/run.yaml 65 run: playbooks/buildimages/run.yaml
diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index c1cf3ba..ce32c5f 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -3,22 +3,24 @@
3register_project_for_upgrade sahara 3register_project_for_upgrade sahara
4register_db_to_save sahara 4register_db_to_save sahara
5devstack_localrc base IMAGE_URLS=\ 5devstack_localrc base IMAGE_URLS=\
6"http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-uec.tar.gz,\ 6"http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-uec.tar.gz,\
7http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2" 7http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2"
8devstack_localrc base enable_plugin sahara \ 8devstack_localrc base enable_plugin sahara \
9 git://git.openstack.org/openstack/sahara \ 9 git://git.openstack.org/openstack/sahara \
10 stable/ocata 10 stable/queens
11devstack_localrc base enable_plugin heat \ 11devstack_localrc base enable_plugin heat \
12 git://git.openstack.org/openstack/heat \ 12 git://git.openstack.org/openstack/heat \
13 stable/ocata 13 stable/queens
14devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.2-x86_64-uec" 14devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec"
15devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec"
15 16
16devstack_localrc target IMAGE_URLS=\ 17devstack_localrc target IMAGE_URLS=\
17"http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-uec.tar.gz,\ 18"http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-uec.tar.gz,\
18http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2" 19http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2"
19devstack_localrc target enable_plugin sahara \ 20devstack_localrc target enable_plugin sahara \
20 git://git.openstack.org/openstack/sahara 21 git://git.openstack.org/openstack/sahara
21devstack_localrc target enable_plugin heat \ 22devstack_localrc target enable_plugin heat \
22 git://git.openstack.org/openstack/heat 23 git://git.openstack.org/openstack/heat
23devstack_localrc target LIBS_FROM_GIT=python-saharaclient 24devstack_localrc target LIBS_FROM_GIT=python-saharaclient
24devstack_localrc target DEFAULT_IMAGE_NAME="cirros-0.3.2-x86_64-uec" 25devstack_localrc target DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec"
26devstack_localrc target SAHARA_USE_MOD_WSGI="False"
diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh
index c381928..5b10d7d 100755
--- a/devstack/upgrade/upgrade.sh
+++ b/devstack/upgrade/upgrade.sh
@@ -38,6 +38,7 @@ set -o errexit
38 38
39# Get functions from current DevStack 39# Get functions from current DevStack
40. $TARGET_DEVSTACK_DIR/stackrc 40. $TARGET_DEVSTACK_DIR/stackrc
41. $TARGET_DEVSTACK_DIR/lib/apache
41. $TARGET_DEVSTACK_DIR/lib/tls 42. $TARGET_DEVSTACK_DIR/lib/tls
42. $(dirname $(dirname $BASH_SOURCE))/plugin.sh 43. $(dirname $(dirname $BASH_SOURCE))/plugin.sh
43. $(dirname $(dirname $BASH_SOURCE))/settings 44. $(dirname $(dirname $BASH_SOURCE))/settings
diff --git a/playbooks/sahara-grenade/post.yaml b/playbooks/sahara-grenade/post.yaml
new file mode 100644
index 0000000..e07f551
--- /dev/null
+++ b/playbooks/sahara-grenade/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/sahara-grenade/run.yaml b/playbooks/sahara-grenade/run.yaml
new file mode 100644
index 0000000..8f4ec04
--- /dev/null
+++ b/playbooks/sahara-grenade/run.yaml
@@ -0,0 +1,65 @@
1- hosts: all
2 name: Autoconverted job legacy-grenade-dsvm-sahara from old job gate-grenade-dsvm-sahara-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 TEMPEST_PLUGINS+=' ../heat-tempest-plugin ../sahara-tests'
33 EOF
34 executable: /bin/bash
35 chdir: '{{ ansible_user_dir }}/workspace'
36 environment: '{{ zuul | zuul_legacy_vars }}'
37
38 - shell:
39 cmd: |
40 set -e
41 set -x
42 export PROJECTS="openstack-dev/grenade $PROJECTS"
43 export PROJECTS="openstack/sahara $PROJECTS"
44 export PROJECTS="openstack/python-saharaclient $PROJECTS"
45 export PROJECTS="openstack/heat-tempest-plugin $PROJECTS"
46 export PROJECTS="openstack/python-heatclient $PROJECTS"
47 export PROJECTS="openstack/sahara-tests $PROJECTS"
48 export PYTHONUNBUFFERED=true
49 export GRENADE_PLUGINRC="enable_grenade_plugin sahara https://git.openstack.org/openstack/sahara"
50 export GRENADE_PLUGINRC+=$'\n'"enable_grenade_plugin heat https://git.openstack.org/openstack/heat"
51
52 export DEVSTACK_GATE_NEUTRON=1
53 export DEVSTACK_GATE_TEMPEST=1
54 export DEVSTACK_GATE_TEMPEST_REGEX="sahara_tempest_plugin.tests.api"
55 export DEVSTACK_GATE_GRENADE=pullup
56 export BRANCH_OVERRIDE=default
57 if [ "$BRANCH_OVERRIDE" != "default" ] ; then
58 export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
59 fi
60
61 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
62 ./safe-devstack-vm-gate-wrap.sh
63 executable: /bin/bash
64 chdir: '{{ ansible_user_dir }}/workspace'
65 environment: '{{ zuul | zuul_legacy_vars }}'