diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-06-23 19:14:42 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-06-23 19:49:56 +0200 |
| commit | e05f59a7ddcfee39c04d8f95bfb04031210c6471 (patch) | |
| tree | 6ae974e6acc1a78884d11265e9fdfdd2acb63e35 /vars/buildPackage.groovy | |
| parent | b594ef70198779cada40db859f82b5ebe49b2a22 (diff) | |
| download | vyos-build-e05f59a7ddcfee39c04d8f95bfb04031210c6471.tar.gz vyos-build-e05f59a7ddcfee39c04d8f95bfb04031210c6471.zip | |
Jenkins: lib: T2625: add getChangeSetPath() function
Retrieve the path where git should check for modified files to trigger
the pipeline build or not.
Diffstat (limited to 'vars/buildPackage.groovy')
| -rw-r--r-- | vars/buildPackage.groovy | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/vars/buildPackage.groovy b/vars/buildPackage.groovy index f0435a6f..35f0784c 100644 --- a/vars/buildPackage.groovy +++ b/vars/buildPackage.groovy @@ -59,7 +59,7 @@ def call(description=null, pkgList=null, buildCmd=null) { environment { // get relative directory path to Jenkinsfile BASE_DIR = getJenkinsfilePath() - CHANGESET_DIR = "**/${env.BASE_DIR}*" + CHANGESET_DIR = getChangeSetPath() DEBIAN_ARCH = sh(returnStdout: true, script: 'dpkg --print-architecture').trim() } options { @@ -69,15 +69,6 @@ def call(description=null, pkgList=null, buildCmd=null) { } stages { stage('Fetch Source') { - when { - beforeOptions true - beforeAgent true - anyOf { - changeset "${env.CHANGESET_DIR}" - triggeredBy 'TimerTrigger' - triggeredBy cause: "UserIdCause" - } - } steps { script { // package build must be done in "any" subdir. Without it the Debian build system @@ -114,7 +105,7 @@ def call(description=null, pkgList=null, buildCmd=null) { beforeOptions true beforeAgent true anyOf { - changeset "${env.CHANGESET_DIR}" + changeset pattern: "${env.CHANGESET_DIR}" triggeredBy 'TimerTrigger' triggeredBy cause: "UserIdCause" } @@ -180,7 +171,6 @@ def call(description=null, pkgList=null, buildCmd=null) { if (env.DEBIAN_ARCH != 'all') ARCH_OPT = '-A ' + env.DEBIAN_ARCH - sh "pwd; ls -al" files = findFiles(glob: '*.deb') if (files) { echo "Uploading package(s) and updating package(s) in the repository ..." |