Skip to content

Commit 71640bf

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Remove distro support based on new libvirt minimum"
2 parents 0072abb + ff10ac3 commit 71640bf

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

functions-common

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,9 @@ function warn {
302302
# such as "install_package" further abstract things in better ways.
303303
#
304304
# ``os_VENDOR`` - vendor name: ``Ubuntu``, ``Fedora``, etc
305-
# ``os_RELEASE`` - major release: ``14.04`` (Ubuntu), ``20`` (Fedora)
305+
# ``os_RELEASE`` - major release: ``16.04`` (Ubuntu), ``23`` (Fedora)
306306
# ``os_PACKAGE`` - package type: ``deb`` or ``rpm``
307-
# ``os_CODENAME`` - vendor's codename for release: ``trusty``
307+
# ``os_CODENAME`` - vendor's codename for release: ``xenial``
308308

309309
declare os_VENDOR os_RELEASE os_PACKAGE os_CODENAME
310310

stack.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# a multi-node developer install.
1313

1414
# To keep this script simple we assume you are running on a recent **Ubuntu**
15-
# (14.04 Trusty or newer), **Fedora** (F20 or newer), or **CentOS/RHEL**
15+
# (16.04 Xenial or newer), **Fedora** (F24 or newer), or **CentOS/RHEL**
1616
# (7 or newer) machine. (It may work on other platforms but support for those
1717
# platforms is left to those who added them to DevStack.) It should work in
1818
# a VM or physical server. Additionally, we maintain a list of ``deb`` and
@@ -192,7 +192,7 @@ source $TOP_DIR/stackrc
192192

193193
# Warn users who aren't on an explicitly supported distro, but allow them to
194194
# override check and attempt installation with ``FORCE=yes ./stack``
195-
if [[ ! ${DISTRO} =~ (trusty|xenial|yakkety|7.0|wheezy|sid|testing|jessie|f23|f24|f25|rhel7|kvmibm1) ]]; then
195+
if [[ ! ${DISTRO} =~ (xenial|yakkety|zesty|sid|testing|jessie|f24|f25|rhel7|kvmibm1) ]]; then
196196
echo "WARNING: this script has not been tested on $DISTRO"
197197
if [[ "$FORCE" != "yes" ]]; then
198198
die $LINENO "If you wish to run this script anyway run with FORCE=yes"

0 commit comments

Comments
 (0)