Merge "Add pipeline to test JS projects"
diff --git a/cicd-lab-pipeline.groovy b/cicd-lab-pipeline.groovy
index 8650bd0..adaedd0 100644
--- a/cicd-lab-pipeline.groovy
+++ b/cicd-lab-pipeline.groovy
@@ -262,6 +262,7 @@
9600 haproxy stats
8080 gerrit
8081 jenkins
+ 8089 LDAP administration
8091 Docker swarm visualizer
8090 Reclass-generated documentation
diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 3074d21..eb28365 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -123,6 +123,7 @@
def outputDestination = "${modelEnv}/classes/cluster/${clusterName}"
sh(returnStdout: true, script: "cp ${outputSource} ${outputDestination} -r")
git.commitGitChanges(modelEnv, "Added new cluster ${clusterName}")
+ archiveArtifacts artifacts: modelEnv
}
stage ('Push changes to Reclass model') {
diff --git a/update-package.groovy b/update-package.groovy
index 6c31c95..b37fe22 100644
--- a/update-package.groovy
+++ b/update-package.groovy
@@ -24,6 +24,7 @@
def result
def packages
def command
+def commandKwargs
node() {
try {
@@ -70,15 +71,17 @@
}
if (TARGET_PACKAGES != "") {
- command = "pkg.install";
+ command = "pkg.install"
packages = TARGET_PACKAGES.tokenize(' ')
+ commandKwargs = ['only_upgrade': 'true']
}else {
command = "pkg.upgrade"
packages = null
}
stage('Apply package upgrades on sample') {
- salt.runSaltProcessStep(saltMaster, targetLiveSubset, command, packages, null, true)
+ out = salt.runSaltCommand(saltMaster, 'local', ['expression': targetLiveSubset, 'type': 'compound'], command, null, packages, commandKwargs)
+ salt.printSaltCommandResult(out)
}
stage('Confirm package upgrades on all nodes') {
@@ -88,7 +91,8 @@
}
stage('Apply package upgrades on all nodes') {
- salt.runSaltProcessStep(saltMaster, targetLiveAll, command, packages, null, true)
+ out = salt.runSaltCommand(saltMaster, 'local', ['expression': targetLiveAll, 'type': 'compound'], command, null, packages, commandKwargs)
+ salt.printSaltCommandResult(out)
}
} catch (Throwable e) {