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

Merge branch 'develop' into suse15fix

Browse source
This commit is contained in:
Nicole Thomas 2018-07-11 09:01:48 -04:00 • committed by GitHub
commit 6fa61603f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Jenkinsfile vendored
View file

@ -71,21 +71,21 @@ def prSetupRuns = prDistroversions.collectEntries {
node ('bootstrap') {
stage('checkout') { checkout scm }
stage('shellcheck') {
sh 'shellcheck -s sh -f checkstyle bootstrap-salt.sh | tee checkstyle.xml'
sh 'stack exec -- shellcheck -s sh -f checkstyle bootstrap-salt.sh | tee checkstyle.xml'
checkstyle pattern: '**/checkstyle.xml'
archiveArtifacts artifacts: '**/checkstyle.xml'
}
if (env.CHANGE_ID) {
// Running for a PR only runs against 4 random distros from a shorter list
stage('kitchen-pr') {
parallel prSetupRuns
}
} else {
// If we're not running for a pr we run *everything*
stage('kitchen-all') {
parallel setupRuns
}
}
// if (env.CHANGE_ID) {
// // Running for a PR only runs against 4 random distros from a shorter list
// stage('kitchen-pr') {
// parallel prSetupRuns
// }
// } else {
// // If we're not running for a pr we run *everything*
// stage('kitchen-all') {
// parallel setupRuns
// }
// }
}
/*

2
bootstrap-salt.sh
View file

@ -457,6 +457,8 @@ shift $((OPTIND-1))
# Define our logging file and pipe paths
LOGFILE="/tmp/$( echo "$__ScriptName" | sed s/.sh/.log/g )"
LOGPIPE="/tmp/$( echo "$__ScriptName" | sed s/.sh/.logpipe/g )"
# Ensure no residual pipe exists
rm "$LOGPIPE" 2>/dev/null
# Create our logging pipe
# On FreeBSD we have to use mkfifo instead of mknod