From 718cc0ea22923c531cf66f531714af2999cfa776 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 21 Jun 2020 12:02:41 +0200 Subject: Jenkins: packages: add underscore for library calls The underscore (_) is not a typo! You need this underscore if the line immediately after the @Library annotation is not an import statement! --- packages/frr/Jenkinsfile | 7 +++++-- packages/netfilter/Jenkinsfile | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/frr/Jenkinsfile b/packages/frr/Jenkinsfile index d661d755..48dc64c8 100644 --- a/packages/frr/Jenkinsfile +++ b/packages/frr/Jenkinsfile @@ -15,8 +15,10 @@ @NonCPS -// Using a version specifier library, use 'current' branch -@Library('vyos-build@current') +// Using a version specifier library, use 'current' branch. The underscore (_) +// is not a typo! You need this underscore if the line immediately after the +// @Library annotation is not an import statement! +@Library('vyos-build@current')_ def pkgList = [ // pkg-libnftnl @@ -26,4 +28,5 @@ def pkgList = [ 'buildCmd': '''./tools/tarsource.sh -V; dpkg-buildpackage -us -uc -Ppkg.frr.rtrlib'''], ] +// Start package build using library function from https://github.com/c-po/vyos-build buildPackage('FRRouting', pkgList) diff --git a/packages/netfilter/Jenkinsfile b/packages/netfilter/Jenkinsfile index d73fd3dd..882ba034 100644 --- a/packages/netfilter/Jenkinsfile +++ b/packages/netfilter/Jenkinsfile @@ -15,8 +15,10 @@ @NonCPS -// Using a version specifier library, use 'current' branch -@Library('vyos-build@current') +// Using a version specifier library, use 'current' branch. The underscore (_) +// is not a typo! You need this underscore if the line immediately after the +// @Library annotation is not an import statement! +@Library('vyos-build@current')_ def pkgList = [ // pkg-libnftnl @@ -47,4 +49,5 @@ def pkgList = [ dpkg-buildpackage -uc -us -tc -b'''] ] +// Start package build using library function from https://github.com/c-po/vyos-build buildPackage('Netfilter', pkgList) -- cgit v1.2.3