summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-08-08 18:31:38 +0200
committerChristian Poessinger <christian@poessinger.com>2021-08-08 18:32:19 +0200
commit3cee66234ab045533e14557e19a6a10aa490fb49 (patch)
tree337a22bc705e709200e1de658b656fb6e6f7a1bf
parentc8d8b10a7747167df4b261836e1390edef6ca82a (diff)
downloadvyos-build-3cee66234ab045533e14557e19a6a10aa490fb49.tar.gz
vyos-build-3cee66234ab045533e14557e19a6a10aa490fb49.zip
Jenkins: lib: fix kernel build trigger
We can only pass one changesPath as variable due toe ANT limitation.
-rw-r--r--packages/linux-kernel/Jenkinsfile2
-rw-r--r--vars/buildPackage.groovy1
2 files changed, 2 insertions, 1 deletions
diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile
index 3e0ed877..74a7579d 100644
--- a/packages/linux-kernel/Jenkinsfile
+++ b/packages/linux-kernel/Jenkinsfile
@@ -58,4 +58,4 @@ def pkgList = [
]
// Start package build using library function from https://github.com/vyos/vyos-build
-buildPackage('Kernel', pkgList, null, true, "**/packages/linux-kernel/**, **/data/defaults.json")
+buildPackage('Kernel', pkgList, null, true, "**/packages/linux-kernel/**")
diff --git a/vars/buildPackage.groovy b/vars/buildPackage.groovy
index 5dc6aeeb..9517a79f 100644
--- a/vars/buildPackage.groovy
+++ b/vars/buildPackage.groovy
@@ -42,6 +42,7 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false, changesP
when {
anyOf {
changeset pattern: changesPattern, caseSensitive: true
+ changeset pattern: "**/data/defaults.json", caseSensitive: true
triggeredBy cause: "UserIdCause"
}
}