Browse code

Convert to openSUSE Leap 15.0 platform testing

Leap 15.0 has been released May 25th, 2018 (see
https://en.opensuse.org/Portal:15.0 ) and we'd like to
transition devstack against it and remove Leap 42.3 from
the testing matrix. Leap 15.0 is newer than Leap 42.3 as
the numbering schema of openSUSE was changed.

Co-Authored-By: Antonio Ojea <itsuugo@gmail.com>

Change-Id: I078f9a2580160c564c33e575008516f5e92239d6

Dirk Mueller authored on 2018/06/20 18:08:54
Showing 4 changed files
... ...
@@ -19,10 +19,10 @@
19 19
           - controller
20 20
 
21 21
 - nodeset:
22
-    name: devstack-single-node-opensuse-423
22
+    name: devstack-single-node-opensuse-150
23 23
     nodes:
24 24
       - name: controller
25
-        label: opensuse-423
25
+        label: opensuse-150
26 26
     groups:
27 27
       - name: tempest
28 28
         nodes:
... ...
@@ -395,10 +395,10 @@
395 395
     voting: false
396 396
 
397 397
 - job:
398
-    name: devstack-platform-opensuse-423
398
+    name: devstack-platform-opensuse-150
399 399
     parent: tempest-full
400
-    description: openSUSE 43.2 platform test
401
-    nodeset: devstack-single-node-opensuse-423
400
+    description: openSUSE 15.0 platform test
401
+    nodeset: devstack-single-node-opensuse-150
402 402
     voting: false
403 403
 
404 404
 - job:
... ...
@@ -487,7 +487,7 @@
487 487
       jobs:
488 488
         - devstack
489 489
         - devstack-platform-centos-7
490
-        - devstack-platform-opensuse-423
490
+        - devstack-platform-opensuse-150
491 491
         - devstack-platform-opensuse-tumbleweed
492 492
         - devstack-platform-fedora-latest
493 493
         - devstack-multinode
... ...
@@ -374,8 +374,10 @@ function GetDistro {
374 374
     elif [[ "$os_VENDOR" =~ (openSUSE) ]]; then
375 375
         DISTRO="opensuse-$os_RELEASE"
376 376
         # Tumbleweed uses "n/a" as a codename, and the release is a datestring
377
-        # like 20180218, so not very useful.
378
-        [ "$os_CODENAME" = "n/a" ] && DISTRO="opensuse-tumbleweed"
377
+        # like 20180218, so not very useful. Leap however uses a release
378
+        # with a "dot", so for example 15.0
379
+        [ "$os_CODENAME" = "n/a" -a "$os_RELEASE" = "${os_RELEASE/\./}" ] && \
380
+            DISTRO="opensuse-tumbleweed"
379 381
     elif [[ "$os_VENDOR" =~ (SUSE LINUX) ]]; then
380 382
         # just use major release
381 383
         DISTRO="sle${os_RELEASE%.*}"
... ...
@@ -1376,7 +1378,7 @@ function zypper_install {
1376 1376
     [[ "$(id -u)" = "0" ]] && sudo="env"
1377 1377
     $sudo http_proxy="${http_proxy:-}" https_proxy="${https_proxy:-}" \
1378 1378
         no_proxy="${no_proxy:-}" \
1379
-        zypper --non-interactive install --auto-agree-with-licenses "$@"
1379
+        zypper --non-interactive install --auto-agree-with-licenses --no-recommends "$@"
1380 1380
 }
1381 1381
 
1382 1382
 function write_user_unit_file {
... ...
@@ -16,7 +16,7 @@ MYSQL_DRIVER=${MYSQL_DRIVER:-PyMySQL}
16 16
 register_database mysql
17 17
 
18 18
 MYSQL_SERVICE_NAME=mysql
19
-if is_fedora && ! is_oraclelinux; then
19
+if is_suse || is_fedora && ! is_oraclelinux; then
20 20
     MYSQL_SERVICE_NAME=mariadb
21 21
 fi
22 22
 
... ...
@@ -221,7 +221,7 @@ write_devstack_version
221 221
 
222 222
 # Warn users who aren't on an explicitly supported distro, but allow them to
223 223
 # override check and attempt installation with ``FORCE=yes ./stack``
224
-if [[ ! ${DISTRO} =~ (xenial|artful|bionic|stretch|jessie|f27|f28|opensuse-42.3|opensuse-tumbleweed|rhel7) ]]; then
224
+if [[ ! ${DISTRO} =~ (xenial|artful|bionic|stretch|jessie|f27|f28|opensuse-42.3|opensuse-15.0|opensuse-tumbleweed|rhel7) ]]; then
225 225
     echo "WARNING: this script has not been tested on $DISTRO"
226 226
     if [[ "$FORCE" != "yes" ]]; then
227 227
         die $LINENO "If you wish to run this script anyway run with FORCE=yes"
... ...
@@ -1137,6 +1137,7 @@ if is_service_enabled neutron; then
1137 1137
     echo_summary "Configuring Neutron"
1138 1138
 
1139 1139
     configure_neutron
1140
+
1140 1141
     # Run init_neutron only on the node hosting the Neutron API server
1141 1142
     if is_service_enabled $DATABASE_BACKENDS && is_service_enabled neutron; then
1142 1143
         init_neutron