saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into stable for v2014.10.14

Browse source
This commit is contained in:
Pedro Algarvio 2014-10-14 05:42:30 +01:00
commit 322f4382fe
5 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS.rst
View file

@ -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

7
ChangeLog
View file

@ -1,3 +1,10 @@
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)
* Disrto Suuport Fixed:
* Init pacman keys if not done so previously
Version 2014.09.25:
* Properly detect Amazon AMI's >= 2014.9. #468

9
bootstrap-salt.sh
View file

@ -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"
#======================================================================================================================
@ -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"
@ -1161,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
@ -3315,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

7
tests/bootstrap/test_install.py
View file

@ -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 = {
@ -29,6 +30,8 @@ CLEANUP_COMMANDS_BY_OS_FAMILY = {
'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 '
@ -167,6 +170,8 @@ class InstallationTestCase(BootstrapTestCase):
'/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)

8
tests/runtests.py
View file

@ -52,6 +52,11 @@ class BootstrapSuiteParser(SaltTestingParser):
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: