Browse Source

grenade: re-enable, really test rocky->master

So far grenade has been testing a queens->rocky upgrade.

Implement the grenade code required to upgrade to the current
master. The plugin code installs the split plugins, which
need to be listed in the PROJECTS variable in order to be cloned.

Also, don't deploy sahara-all even when deploying rocky
(it was already deprecated back then).

Finally, deploying sahara-api using wsgi has been the default
for a while and for sure when the upgrade starts from rocky
there is no need to disable it.

The grenade test should be stable enough again, so re-enable it
in both the check and the gate queue.

Change-Id: I000aae6c093c32ab1c3505448e2b9ec52b0529a2
Luigi Toscano 1 month ago
parent
commit
8010e24a56

+ 8
- 5
.zuul.yaml View File

@@ -19,8 +19,7 @@
19 19
         - sahara-tests-tempest-v2
20 20
         - openstack-tox-cover:
21 21
             voting: false
22
-        - sahara-grenade:
23
-            voting: false
22
+        - sahara-grenade
24 23
     gate:
25 24
       queue: sahara
26 25
       jobs:
@@ -28,9 +27,7 @@
28 27
         - sahara-tests-scenario-v2
29 28
         - sahara-tests-tempest
30 29
         - sahara-tests-tempest-v2
31
-        - sahara-grenade:
32
-            voting: false
33
-
30
+        - sahara-grenade
34 31
     experimental:
35 32
       jobs:
36 33
         - sahara-buildimages-ambari
@@ -55,6 +52,12 @@
55 52
       - openstack/heat-tempest-plugin
56 53
       - openstack/python-heatclient
57 54
       - openstack/sahara-tests
55
+      - openstack/sahara-plugin-ambari
56
+      - openstack/sahara-plugin-cdh
57
+      - openstack/sahara-plugin-mapr
58
+      - openstack/sahara-plugin-spark
59
+      - openstack/sahara-plugin-storm
60
+      - openstack/sahara-plugin-vanilla
58 61
     irrelevant-files:
59 62
       - ^(test-|)requirements.txt$
60 63
       - ^.*\.rst$

+ 1
- 4
devstack/plugin.sh View File

@@ -264,8 +264,6 @@ function start_sahara {
264 264
         restart_apache_server
265 265
         tail_log sahara-api /var/log/$APACHE_NAME/sahara-api.log
266 266
     else
267
-        run_process sahara-all "$SAHARA_BIN_DIR/sahara-all \
268
-            --config-file $SAHARA_CONF_FILE"
269 267
         run_process sahara-api "$SAHARA_BIN_DIR/sahara-api \
270 268
             --config-file $SAHARA_CONF_FILE"
271 269
     fi
@@ -312,8 +310,7 @@ function stop_sahara {
312 310
 # correctly throughout devstack.
313 311
 function is_sahara_enabled {
314 312
     if is_service_enabled sahara-api || \
315
-        is_service_enabled sahara-eng || \
316
-        is_service_enabled sahara-all; then
313
+        is_service_enabled sahara-eng; then
317 314
         return 0
318 315
     else
319 316
         return 1

+ 18
- 0
devstack/upgrade/from-rocky/upgrade-sahara View File

@@ -0,0 +1,18 @@
1
+#!/usr/bin/env bash
2
+
3
+# ``upgrade-sahara``
4
+
5
+function configure_sahara_upgrade {
6
+    XTRACE=$(set +o | grep xtrace)
7
+    set -o xtrace
8
+
9
+    install_ambari
10
+    install_cdh
11
+    install_mapr
12
+    install_spark
13
+    install_storm
14
+    install_vanilla
15
+
16
+    # reset to previous state
17
+    $XTRACE
18
+}

+ 2
- 3
devstack/upgrade/settings View File

@@ -7,10 +7,10 @@ devstack_localrc base IMAGE_URLS=\
7 7
 http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2"
8 8
 devstack_localrc base enable_plugin sahara \
9 9
                                     git://git.openstack.org/openstack/sahara \
10
-                                    stable/queens
10
+                                    stable/rocky
11 11
 devstack_localrc base enable_plugin heat \
12 12
                                     git://git.openstack.org/openstack/heat \
13
-                                    stable/queens
13
+                                    stable/rocky
14 14
 devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec"
15 15
 devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec"
16 16
 
@@ -23,4 +23,3 @@ devstack_localrc target enable_plugin heat \
23 23
                                     git://git.openstack.org/openstack/heat
24 24
 devstack_localrc target LIBS_FROM_GIT=python-saharaclient
25 25
 devstack_localrc target DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec"
26
-devstack_localrc target SAHARA_USE_MOD_WSGI="False"

+ 7
- 0
playbooks/sahara-grenade/run.yaml View File

@@ -45,11 +45,18 @@
45 45
           export PROJECTS="openstack/heat-tempest-plugin $PROJECTS"
46 46
           export PROJECTS="openstack/python-heatclient $PROJECTS"
47 47
           export PROJECTS="openstack/sahara-tests $PROJECTS"
48
+          export PROJECTS="openstack/sahara-plugin-ambari $PROJECTS"
49
+          export PROJECTS="openstack/sahara-plugin-cdh $PROJECTS"
50
+          export PROJECTS="openstack/sahara-plugin-mapr $PROJECTS"
51
+          export PROJECTS="openstack/sahara-plugin-spark $PROJECTS"
52
+          export PROJECTS="openstack/sahara-plugin-storm $PROJECTS"
53
+          export PROJECTS="openstack/sahara-plugin-vanilla $PROJECTS"
48 54
           export PYTHONUNBUFFERED=true
49 55
           export GRENADE_PLUGINRC="enable_grenade_plugin sahara https://git.openstack.org/openstack/sahara"
50 56
           export GRENADE_PLUGINRC+=$'\n'"enable_grenade_plugin heat https://git.openstack.org/openstack/heat"
51 57
 
52 58
           export DEVSTACK_GATE_NEUTRON=1
59
+          export RUN_HEAT_INTEGRATION_TESTS=False
53 60
           export DEVSTACK_GATE_TEMPEST=1
54 61
           export DEVSTACK_GATE_TEMPEST_REGEX="sahara_tempest_plugin.tests.api"
55 62
           export DEVSTACK_GATE_GRENADE=pullup

Loading…
Cancel
Save