From a438b1f1e9659f9e02c0650b2738524667d31414 Mon Sep 17 00:00:00 2001 From: Ch3LL Date: Mon, 7 Jan 2019 16:07:29 -0500 Subject: [PATCH 1/2] Update bootstrap stabl with new 2019.2 branch --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 7a84c15..2792c55 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -590,14 +590,14 @@ elif [ "$ITYPE" = "stable" ]; then if [ "$#" -eq 0 ];then STABLE_REV="latest" else - if [ "$(echo "$1" | grep -E '^(latest|1\.6|1\.7|2014\.1|2014\.7|2015\.5|2015\.8|2016\.3|2016\.11|2017\.7|2018\.3)$')" != "" ]; then + if [ "$(echo "$1" | grep -E '^(latest|1\.6|1\.7|2014\.1|2014\.7|2015\.5|2015\.8|2016\.3|2016\.11|2017\.7|2018\.3|2019\.2)$')" != "" ]; then STABLE_REV="$1" shift elif [ "$(echo "$1" | grep -E '^([0-9]*\.[0-9]*\.[0-9]*)$')" != "" ]; then STABLE_REV="archive/$1" shift else - echo "Unknown stable version: $1 (valid: 1.6, 1.7, 2014.1, 2014.7, 2015.5, 2015.8, 2016.3, 2016.11, 2017.7, 2018.3, latest, \$MAJOR.\$MINOR.\$PATCH)" + echo "Unknown stable version: $1 (valid: 1.6, 1.7, 2014.1, 2014.7, 2015.5, 2015.8, 2016.3, 2016.11, 2017.7, 2018.3, 2019.2, latest, \$MAJOR.\$MINOR.\$PATCH)" exit 1 fi fi From 5e5a3e7a770674576cc16117c52f7b13d660307a Mon Sep 17 00:00:00 2001 From: Ch3LL Date: Tue, 8 Jan 2019 09:28:10 -0500 Subject: [PATCH 2/2] Update kitchen.yml with 2019.2 version --- .kitchen.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index 21112a4..886b4f1 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -93,9 +93,9 @@ suites: - name: py2-git-2018.3 provisioner: salt_version: 2018.3 - - name: py2-git-fluorine + - name: py2-git-2019.2 provisioner: - salt_version: fluorine + salt_version: 2019.2 - name: py2-git-develop provisioner: salt_version: develop