Merge "Add possibility to build only some binary packages"
diff --git a/docker-build-image-pipeline.groovy b/docker-build-image-pipeline.groovy
index 65bf1d0..d456db2 100644
--- a/docker-build-image-pipeline.groovy
+++ b/docker-build-image-pipeline.groovy
@@ -24,6 +24,7 @@
gerrit.gerritPatchsetCheckout(IMAGE_GIT_URL, "", IMAGE_BRANCH, IMAGE_CREDENTIALS_ID)
}
stage("build") {
+ common.infoMsg("Building docker image ${IMAGE_NAME}")
dockerApp = dockerLib.buildDockerImage(IMAGE_NAME, "", "${workspace}/${DOCKERFILE_PATH}", imageTagsList[0])
if(!dockerApp){
throw new Exception("Docker build image failed")
@@ -31,6 +32,7 @@
}
stage("upload to docker hub"){
for(int i=0;i<imageTagsList.size();i++){
+ common.infoMsg("Uploading image ${IMAGE_NAME} with tag ${imageTagsList[i]}")
dockerApp.push(imageTagsList[i])
}
}
diff --git a/update-package.groovy b/update-package.groovy
index b37fe22..73db088 100644
--- a/update-package.groovy
+++ b/update-package.groovy
@@ -35,13 +35,18 @@
stage('List target servers') {
minions = salt.getMinions(saltMaster, targetAll)
+
+ if (minions.isEmpty()) {
+ throw new Exception("No minion was targeted")
+ }
+
if (TARGET_SUBSET_TEST != "") {
targetTestSubset = minions.subList(0, Integer.valueOf(TARGET_SUBSET_TEST)).join(' or ')
- }
- else {
+ } else {
targetTestSubset = minions.join(' or ')
}
targetLiveSubset = minions.subList(0, Integer.valueOf(TARGET_SUBSET_LIVE)).join(' or ')
+
targetLiveAll = minions.join(' or ')
common.infoMsg("Found nodes: ${targetLiveAll}")
common.infoMsg("Selected test nodes: ${targetTestSubset}")