summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-06-21 12:31:22 +0200
committerChristian Poessinger <christian@poessinger.com>2020-06-21 12:31:22 +0200
commit055d658a71c89aaa27f8b9bc77d8686410a5725c (patch)
treef5f2c62f3ec0ad97764b3816181c90cbf751aa81
parent4d11e8b33dfc545d9dab03efcb6fba8e4140f2a9 (diff)
downloadvyos-build-055d658a71c89aaa27f8b9bc77d8686410a5725c.tar.gz
vyos-build-055d658a71c89aaa27f8b9bc77d8686410a5725c.zip
Jenkins: lib: Nested when condition "not" requires exactly 1 child condition
-rw-r--r--Jenkinsfile22
1 files changed, 8 insertions, 14 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 19227442..d865fea1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -169,13 +169,10 @@ pipeline {
beforeOptions true
beforeAgent true
anyOf {
- // Do not run ISO build when the Docker container definition or
- // the build pipeline library changes as this has no direct impact
- // on the ISO image.
- not {
- changeset "**/docker/*"
- changeset "**/vars/*"
- }
+ // Do not run ISO build when the Docker container definition or the build pipeline
+ // library changes as this has no direct impact on the ISO image.
+ not { changeset "**/docker/*" }
+ not { changeset "**/vars/*" }
triggeredBy 'TimerTrigger'
triggeredBy cause: "UserIdCause"
}
@@ -202,13 +199,10 @@ pipeline {
beforeOptions true
beforeAgent true
anyOf {
- // Do not run ISO build when the Docker container definition or
- // the build pipeline library changes as this has no direct impact
- // on the ISO image.
- not {
- changeset "**/docker/*"
- changeset "**/vars/*"
- }
+ // Do not run ISO build when the Docker container definition or the build pipeline
+ // library changes as this has no direct impact on the ISO image.
+ not { changeset "**/docker/*" }
+ not { changeset "**/vars/*" }
triggeredBy 'TimerTrigger'
triggeredBy cause: "UserIdCause"
}