diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-01-10 15:37:10 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-01-10 15:38:35 +0100 |
| commit | aa8cb769795ed53dbac885c4cb0038f30ce4f7aa (patch) | |
| tree | 65cfb9f304fda9df24f507c5f59ed75bf913e557 | |
| parent | 6d61a39580c94706a950e14be3495a7c23f9d84b (diff) | |
| download | vyos-build-aa8cb769795ed53dbac885c4cb0038f30ce4f7aa.tar.gz vyos-build-aa8cb769795ed53dbac885c4cb0038f30ce4f7aa.zip | |
Jenkins: select build library from equuleus branch
| -rw-r--r-- | Jenkinsfile | 5 | ||||
| -rw-r--r-- | data/defaults.json | 4 | ||||
| -rw-r--r-- | packages/frr/Jenkinsfile | 4 | ||||
| -rw-r--r-- | packages/iproute2/Jenkinsfile | 6 | ||||
| m--------- | packages/iproute2/iproute2 | 0 | ||||
| -rw-r--r-- | packages/linux-kernel/Jenkinsfile | 4 | ||||
| -rw-r--r-- | packages/netfilter/Jenkinsfile | 4 |
7 files changed, 13 insertions, 14 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 814e6d5f..01858f2a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,11 +16,10 @@ @NonCPS -// Using a version specifier library, use 'current' branch. The underscore (_) +// Using a version specifier library, use 'equuleus' 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')_ - +@Library('vyos-build@equuleus')_ // Only keep the 10 most recent builds def projectProperties = [ diff --git a/data/defaults.json b/data/defaults.json index afe7227b..2c833289 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -3,8 +3,8 @@ "debian_mirror": "http://deb.debian.org/debian", "debian_security_mirror": "http://deb.debian.org/debian-security", "debian_distribution": "buster", - "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", - "vyos_branch": "current", + "vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus", + "vyos_branch": "equuleus", "kernel_version": "5.4.88", "kernel_flavor": "amd64-vyos", "release_train": "equuleus", diff --git a/packages/frr/Jenkinsfile b/packages/frr/Jenkinsfile index 65803092..253171ff 100644 --- a/packages/frr/Jenkinsfile +++ b/packages/frr/Jenkinsfile @@ -15,10 +15,10 @@ @NonCPS -// Using a version specifier library, use 'current' branch. The underscore (_) +// Using a version specifier library, use 'equuleus' 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')_ +@Library('vyos-build@equuleus')_ def pkgList = [ ['name': 'frr', diff --git a/packages/iproute2/Jenkinsfile b/packages/iproute2/Jenkinsfile index 4844c8f7..ef8139e3 100644 --- a/packages/iproute2/Jenkinsfile +++ b/packages/iproute2/Jenkinsfile @@ -15,14 +15,14 @@ @NonCPS -// Using a version specifier library, use 'current' branch. The underscore (_) +// Using a version specifier library, use 'equuleus' 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')_ +@Library('vyos-build@equuleus')_ def pkgList = [ ['name': 'iproute2', - 'scmCommit': 'debian/5.4.0-1_bpo10+1', + 'scmCommit': 'debian/5.10.0-2', 'scmUrl': 'https://salsa.debian.org/debian/iproute2', 'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'], ] diff --git a/packages/iproute2/iproute2 b/packages/iproute2/iproute2 deleted file mode 160000 -Subproject ae0b22e5a74391df3d6064f2f57ed31e222180b diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile index 5736f994..730ae41d 100644 --- a/packages/linux-kernel/Jenkinsfile +++ b/packages/linux-kernel/Jenkinsfile @@ -15,10 +15,10 @@ @NonCPS -// Using a version specifier library, use 'current' branch. The underscore (_) +// Using a version specifier library, use 'equuleus' 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')_ +@Library('vyos-build@equuleus')_ /* Only keep the most recent builds. */ def projectProperties = [ diff --git a/packages/netfilter/Jenkinsfile b/packages/netfilter/Jenkinsfile index 60df1318..6dff576c 100644 --- a/packages/netfilter/Jenkinsfile +++ b/packages/netfilter/Jenkinsfile @@ -15,10 +15,10 @@ @NonCPS -// Using a version specifier library, use 'current' branch. The underscore (_) +// Using a version specifier library, use 'equuleus' 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')_ +@Library('vyos-build@equuleus')_ def pkgList = [ // libnftnl |