Skip to content

Commit 297a50a

Browse files
dirkmuellerAntonio Ojea
authored andcommitted
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
1 parent eb7d1ad commit 297a50a

4 files changed

Lines changed: 14 additions & 11 deletions

File tree

.zuul.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
- controller
2020

2121
- nodeset:
22-
name: devstack-single-node-opensuse-423
22+
name: devstack-single-node-opensuse-150
2323
nodes:
2424
- name: controller
25-
label: opensuse-423
25+
label: opensuse-150
2626
groups:
2727
- name: tempest
2828
nodes:
@@ -395,10 +395,10 @@
395395
voting: false
396396

397397
- job:
398-
name: devstack-platform-opensuse-423
398+
name: devstack-platform-opensuse-150
399399
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
402402
voting: false
403403

404404
- job:
@@ -487,7 +487,7 @@
487487
jobs:
488488
- devstack
489489
- devstack-platform-centos-7
490-
- devstack-platform-opensuse-423
490+
- devstack-platform-opensuse-150
491491
- devstack-platform-opensuse-tumbleweed
492492
- devstack-platform-fedora-latest
493493
- devstack-multinode

functions-common

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,10 @@ function GetDistro {
374374
elif [[ "$os_VENDOR" =~ (openSUSE) ]]; then
375375
DISTRO="opensuse-$os_RELEASE"
376376
# 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"
379381
elif [[ "$os_VENDOR" =~ (SUSE LINUX) ]]; then
380382
# just use major release
381383
DISTRO="sle${os_RELEASE%.*}"
@@ -1376,7 +1378,7 @@ function zypper_install {
13761378
[[ "$(id -u)" = "0" ]] && sudo="env"
13771379
$sudo http_proxy="${http_proxy:-}" https_proxy="${https_proxy:-}" \
13781380
no_proxy="${no_proxy:-}" \
1379-
zypper --non-interactive install --auto-agree-with-licenses "$@"
1381+
zypper --non-interactive install --auto-agree-with-licenses --no-recommends "$@"
13801382
}
13811383

13821384
function write_user_unit_file {

lib/databases/mysql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ MYSQL_DRIVER=${MYSQL_DRIVER:-PyMySQL}
1616
register_database mysql
1717

1818
MYSQL_SERVICE_NAME=mysql
19-
if is_fedora && ! is_oraclelinux; then
19+
if is_suse || is_fedora && ! is_oraclelinux; then
2020
MYSQL_SERVICE_NAME=mariadb
2121
fi
2222

stack.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ write_devstack_version
221221

222222
# Warn users who aren't on an explicitly supported distro, but allow them to
223223
# 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
225225
echo "WARNING: this script has not been tested on $DISTRO"
226226
if [[ "$FORCE" != "yes" ]]; then
227227
die $LINENO "If you wish to run this script anyway run with FORCE=yes"
@@ -1137,6 +1137,7 @@ if is_service_enabled neutron; then
11371137
echo_summary "Configuring Neutron"
11381138

11391139
configure_neutron
1140+
11401141
# Run init_neutron only on the node hosting the Neutron API server
11411142
if is_service_enabled $DATABASE_BACKENDS && is_service_enabled neutron; then
11421143
init_neutron

0 commit comments

Comments
 (0)