Merge "Add and switch to the newly created opensuse-15 nodeset"

This commit is contained in:
Zuul 2019-07-26 09:52:04 +00:00 committed by Gerrit Code Review
commit ffbab01c08
2 changed files with 7 additions and 7 deletions

View File

@ -39,10 +39,10 @@
- controller
- nodeset:
name: devstack-single-node-opensuse-150
name: devstack-single-node-opensuse-15
nodes:
- name: controller
label: opensuse-150
label: opensuse-15
groups:
- name: tempest
nodes:
@ -532,10 +532,10 @@
voting: false
- job:
name: devstack-platform-opensuse-150
name: devstack-platform-opensuse-15
parent: tempest-full-py3
description: openSUSE 15.0 platform test
nodeset: devstack-single-node-opensuse-150
description: openSUSE 15.x platform test
nodeset: devstack-single-node-opensuse-15
voting: false
- job:
@ -627,7 +627,7 @@
- devstack-ipv6:
voting: false
- devstack-platform-centos-7
- devstack-platform-opensuse-150
- devstack-platform-opensuse-15
- devstack-platform-fedora-latest
- devstack-platform-xenial
- devstack-multinode

View File

@ -224,7 +224,7 @@ write_devstack_version
# Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``FORCE=yes ./stack``
if [[ ! ${DISTRO} =~ (xenial|artful|bionic|stretch|jessie|f28|f29|opensuse-42.3|opensuse-15.0|opensuse-tumbleweed|rhel7) ]]; then
if [[ ! ${DISTRO} =~ (xenial|artful|bionic|stretch|jessie|f28|f29|opensuse-15.0|opensuse-15.1|opensuse-tumbleweed|rhel7) ]]; then
echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes"