From 047ba7ac1a518ce78bbd1c5cf1e8134c20b53c28 Mon Sep 17 00:00:00 2001 From: Skyler Berg Date: Thu, 25 Sep 2014 20:16:28 -0700 Subject: [PATCH 01/13] Add support for Linux Mint 17 --- bootstrap-salt.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 182337263..143306f01 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -937,6 +937,7 @@ __ubuntu_derivatives_translation() { # https://bugs.launchpad.net/linuxmint/+bug/1198751 linuxmint_16_ubuntu_base="13.10" + linuxmint_17_ubuntu_base="14.04" linaro_12_ubuntu_base="12.04" elementary_os_02_ubuntu_base="12.04" From cb6d84b698e00fdcf465ad9c287f268b192b62f2 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 27 Sep 2014 02:02:54 +0100 Subject: [PATCH 02/13] Added Skyler Berg(@skylerberg) to AUTHORS --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index 14b60e5a3..06cf6cf79 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -45,6 +45,7 @@ Pedro Algarvio s0undt3ch pedro@algarvio.me Pedro Paulo pedropaulovc Raymond Barbiero visualphoenix Roberto Aguilar rca roberto@baremetal.io +Skyler Berg skylerberg skylertheberg@gmail.com Tate Eskew tateeskew Thomas S. Hatch thatch45 thatch45@saltstack.com Valentin Bud valentinbud valentin@databus.pro From 19276c53a804fa90e365c15241b659745b9f18b9 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 27 Sep 2014 02:03:12 +0100 Subject: [PATCH 03/13] Update changes log --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 44074a179..e3dfb5fae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Version 2014.xx.xx: + * Distro Support Added: + * Added Linux Mint 17 support(Thanks Skyler Berg) + Version 2014.09.25: * Properly detect Amazon AMI's >= 2014.9. #468 From 01b50db405b29823e933553df2707115990f7967 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 27 Sep 2014 14:23:48 +0100 Subject: [PATCH 04/13] Init pacman keys if not done so previously --- bootstrap-salt.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 143306f01..537fda724 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3316,6 +3316,10 @@ install_amazon_linux_ami_testing_post() { # install_arch_linux_stable_deps() { + if [ ! -f /etc/pacman.d/gnupg ]; then + pacman-key --init && pacman-key --populate archlinux || return 1 + fi + if [ "$_UPGRADE_SYS" -eq $BS_TRUE ]; then pacman -Syyu --noconfirm --needed || return 1 fi From f86b410fb1910aa638a9029b8c5a2ffff39a020f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 27 Sep 2014 14:24:27 +0100 Subject: [PATCH 05/13] Update changes log --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index e3dfb5fae..aad1e22cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ Version 2014.xx.xx: * Distro Support Added: * Added Linux Mint 17 support(Thanks Skyler Berg) + * Disrto Suuport Fixed: + * Init pacman keys if not done so previously Version 2014.09.25: * Properly detect Amazon AMI's >= 2014.9. #468 From 75031f2e4d635a381e25b889c09071ff2d31e9b9 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 2 Oct 2014 22:20:15 +0100 Subject: [PATCH 06/13] Match v2014.7 but not 2014.7 as a valid Salt tag --- bootstrap-salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 537fda724..5d594ec73 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1162,7 +1162,7 @@ __git_clone_and_checkout() { fi else __SHALLOW_CLONE="${BS_FALSE}" - if [ "$(echo "$GIT_REV" | sed 's/^.*\(v[[:digit:]]\{1,4\}\.[[:digit:]]\{1,2\}\.[[:digit:]]\{1,2\}\)\?.*$/MATCH/')" = "MATCH" ]; then + if [ "$(echo "$GIT_REV" | sed 's/^.*\(v[[:digit:]]\{1,4\}\.[[:digit:]]\{1,2\}\)\(\.[[:digit:]]\{1,2\}\)\?.*$/MATCH/')" = "MATCH" ]; then echoinfo "Git revision matches a Salt version tag" # Let's try shallow cloning to speed up. # Test for "--single-branch" option introduced in git 1.7.10, the minimal version of git where the shallow From f1f280e5af429f3b12ddc2c673d34e83cb11372d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 2 Oct 2014 22:21:46 +0100 Subject: [PATCH 07/13] Update changes log --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index aad1e22cc..bcc8a4771 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ Version 2014.xx.xx: + * Fixed a regex issue with matching Salt's tags. Match v2014.7 but not 2014.7 as a valid tag * Distro Support Added: * Added Linux Mint 17 support(Thanks Skyler Berg) * Disrto Suuport Fixed: From 8c46d07840f6a7aeeac7c0733913d0b2ecc53154 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 4 Oct 2014 11:13:21 +0100 Subject: [PATCH 08/13] Don't delete the salt-testing package during tests --- tests/bootstrap/test_install.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/bootstrap/test_install.py b/tests/bootstrap/test_install.py index ff948829d..52cc41872 100644 --- a/tests/bootstrap/test_install.py +++ b/tests/bootstrap/test_install.py @@ -167,6 +167,8 @@ def tearDown(self): '/var/*/salt*', ): for entry in glob.glob(glob_rule): + if 'salttesting' in glob_rule: + continue if os.path.isfile(entry): print 'Removing file {0!r}'.format(entry) os.remove(entry) From d7c6113c69653cad7a74d5840b2ab531f32ab7f1 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 4 Oct 2014 11:14:40 +0100 Subject: [PATCH 09/13] Remove libcloud and requests during test cleanup --- tests/bootstrap/test_install.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/bootstrap/test_install.py b/tests/bootstrap/test_install.py index 52cc41872..d41ec9d62 100644 --- a/tests/bootstrap/test_install.py +++ b/tests/bootstrap/test_install.py @@ -29,6 +29,8 @@ 'pacman -Qs python2-psutil && pacman -Rsc --noconfirm python2-psutil && exit $? || exit 0', 'pacman -Qs python2-pyzmq && pacman -Rsc --noconfirm python2-pyzmq && exit $? || exit 0', 'pacman -Qs zeromq && pacman -Rsc --noconfirm zeromq && exit $? || exit 0', + 'pacman -Qs apache-libcloud && pacman -Rsc --noconfirm apache-libcloud && exit $? || exit 0', + 'pacman -Qs python2-requests && pacman -Rsc --noconfirm python2-requests && exit $? || exit 0', ], 'Debian': [ 'apt-get remove -y -o DPkg::Options::=--force-confold ' From f13e036179b28025955a908cd99242bfdd7353b4 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 4 Oct 2014 11:16:04 +0100 Subject: [PATCH 10/13] Try to get the current stable version from the environ --- tests/bootstrap/test_install.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/bootstrap/test_install.py b/tests/bootstrap/test_install.py index d41ec9d62..ac4360882 100644 --- a/tests/bootstrap/test_install.py +++ b/tests/bootstrap/test_install.py @@ -10,12 +10,13 @@ :license: Apache 2.0, see LICENSE for more details. ''' +import os import re import glob import shutil from bootstrap.unittesting import * -CURRENT_SALT_STABLE_VERSION = 'v0.15.1' +CURRENT_SALT_STABLE_VERSION = os.environ.get(CURRENT_SALT_STABLE_VERSION, 'v2014.1.10') CLEANUP_COMMANDS_BY_OS_FAMILY = { From c21ad6ed15c28692510877345ac93df18398136d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 4 Oct 2014 11:18:56 +0100 Subject: [PATCH 11/13] Update the runtests parser to set the stable version in the environ --- tests/runtests.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/runtests.py b/tests/runtests.py index 7125195cd..5ee8859e3 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -52,6 +52,11 @@ def setup_additional_options(self): action='store_true', help='Run Installation tests' ) + self.test_selection_group.add_option( + '--stable-salt-version', + default='v2014.1.10', + help='Specify the current stable release of salt' + ) def run_integration_suite(self, display_name, suffix='[!_]*.py'): ''' @@ -82,6 +87,9 @@ def main(): print 'Detected system grains:' pprint.pprint(GRAINS) + # Set the current stable version of salt + os.environ['CURRENT_SALT_STABLE_VERSION'] = options.stable_salt_version + overall_status = [] if options.name: From 051c43915f7e0535523ce8173f050b7111129ad4 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 4 Oct 2014 11:29:15 +0100 Subject: [PATCH 12/13] It's a String! --- tests/bootstrap/test_install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bootstrap/test_install.py b/tests/bootstrap/test_install.py index ac4360882..0b34ec888 100644 --- a/tests/bootstrap/test_install.py +++ b/tests/bootstrap/test_install.py @@ -16,7 +16,7 @@ import shutil from bootstrap.unittesting import * -CURRENT_SALT_STABLE_VERSION = os.environ.get(CURRENT_SALT_STABLE_VERSION, 'v2014.1.10') +CURRENT_SALT_STABLE_VERSION = os.environ.get('CURRENT_SALT_STABLE_VERSION', 'v2014.1.10') CLEANUP_COMMANDS_BY_OS_FAMILY = { From 54a38f4461aba8e70dfb4b664df6f070f2aa665d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 14 Oct 2014 05:42:05 +0100 Subject: [PATCH 13/13] Bump version for stable release --- ChangeLog | 2 +- bootstrap-salt.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bcc8a4771..4e58f37ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Version 2014.xx.xx: +Version 2014.10.14: * Fixed a regex issue with matching Salt's tags. Match v2014.7 but not 2014.7 as a valid tag * Distro Support Added: * Added Linux Mint 17 support(Thanks Skyler Berg) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 5d594ec73..ca985f150 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -17,7 +17,7 @@ # CREATED: 10/15/2012 09:49:37 PM WEST #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2014.09.24" +__ScriptVersion="2014.10.14" __ScriptName="bootstrap-salt.sh" #======================================================================================================================