summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Jenkinsfile10
-rw-r--r--Jenkinsfile.docker6
-rw-r--r--data/defaults.toml6
-rw-r--r--docker/Dockerfile6
-rw-r--r--packages/aws-gateway-load-balancer-tunnel-handler/Jenkinsfile4
-rw-r--r--packages/ddclient/Jenkinsfile4
-rw-r--r--packages/dropbear/Jenkinsfile4
-rw-r--r--packages/frr/Jenkinsfile4
-rw-r--r--packages/hostap/Jenkinsfile4
-rw-r--r--packages/hsflowd/Jenkinsfile4
-rw-r--r--packages/linux-kernel/Jenkinsfile4
-rw-r--r--packages/ndppd/Jenkinsfile4
-rw-r--r--packages/netfilter/Jenkinsfile4
-rw-r--r--packages/opennhrp/Jenkinsfile4
-rw-r--r--packages/openvpn-otp/Jenkinsfile4
-rw-r--r--packages/owamp/Jenkinsfile4
-rw-r--r--packages/pam_tacplus/Jenkinsfile4
-rw-r--r--packages/pyhumps/Jenkinsfile4
-rw-r--r--packages/strongswan/Jenkinsfile4
-rw-r--r--packages/telegraf/Jenkinsfile4
-rw-r--r--packages/vpp/Jenkinsfile4
-rw-r--r--packages/wide-dhcpv6/Jenkinsfile4
-rwxr-xr-xscripts/list-package-arch2
-rwxr-xr-xtools/get_latest_iso.py2
-rw-r--r--vars/buildPackage.groovy6
25 files changed, 55 insertions, 55 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index bbbc4bbe..cec10776 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
-// Copyright (C) 2019-2021 VyOS maintainers and contributors
+// Copyright (C) 2019-2023 VyOS maintainers and contributors
//
// This program is free software; you can redistribute it and/or modify
// in order to easy exprort images built to "external" world
@@ -15,10 +15,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
setDescription()
node('Docker') {
@@ -30,11 +30,11 @@ node('Docker') {
if (isPullRequest())
branchName = env.CHANGE_TARGET.toLowerCase()
if (branchName.equals('master'))
- branchName = 'current'
+ branchName = 'sagitta'
env.DOCKER_IMAGE = 'vyos/vyos-build:' + branchName
- // Get the current UID and GID from the jenkins agent to allow use of the same UID inside Docker
+ // Get the sagitta UID and GID from the jenkins agent to allow use of the same UID inside Docker
env.USR_ID = sh(returnStdout: true, script: 'id -u').toString().trim()
env.GRP_ID = sh(returnStdout: true, script: 'id -g').toString().trim()
env.DOCKER_ARGS = '--privileged --sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=' + env.USR_ID + ' -e GOSU_GID=' + env.GRP_ID
diff --git a/Jenkinsfile.docker b/Jenkinsfile.docker
index 2cac4548..0fbdaa08 100644
--- a/Jenkinsfile.docker
+++ b/Jenkinsfile.docker
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
-// Copyright (C) 2019-2021 VyOS maintainers and contributors
+// Copyright (C) 2019-2023 VyOS maintainers and contributors
//
// This program is free software; you can redistribute it and/or modify
// in order to easy exprort images built to "external" world
@@ -15,10 +15,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
setDescription()
pipeline {
diff --git a/data/defaults.toml b/data/defaults.toml
index d34b05fb..6ceebc07 100644
--- a/data/defaults.toml
+++ b/data/defaults.toml
@@ -9,10 +9,10 @@ debian_security_mirror = "http://deb.debian.org/debian-security"
debian_archive_areas = "main contrib non-free"
-vyos_mirror = "https://rolling-packages.vyos.net/current"
+vyos_mirror = "http://dev.packages.vyos.net/repositories/sagitta"
-vyos_branch = "current"
-release_train = "current"
+vyos_branch = "sagitta"
+release_train = "sagitta"
kernel_version = "6.1.54"
bootloaders = "syslinux,grub-efi"
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a1d22b26..dab32b3d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -31,11 +31,11 @@ RUN grep "VERSION_ID" /etc/os-release || (echo 'VERSION_ID="12"' >> /etc/os-rele
# arm32v7/
# arm64v8/
# Example bo byukd natively:
-# docker build -t vyos-build:current .
+# docker build -t vyos-build:sagitta .
# Example to build on armhf:
-# docker build -t vyos-build:current-armhf --build-arg ARCH=arm32v7/ .
+# docker build -t vyos-build:sagitta-armhf --build-arg ARCH=arm32v7/ .
# Example to build on arm64:
-# docker build -t vyos-build:current-arm64 --build-arg ARCH=arm64v8/ .
+# docker build -t vyos-build:sagitta-arm64 --build-arg ARCH=arm64v8/ .
# On some versions of docker the emulation framework is not installed by default and
# you need to install qemu, qemu-user-static and register qemu inside docker manually using:
diff --git a/packages/aws-gateway-load-balancer-tunnel-handler/Jenkinsfile b/packages/aws-gateway-load-balancer-tunnel-handler/Jenkinsfile
index 0f9cb7e3..70746aee 100644
--- a/packages/aws-gateway-load-balancer-tunnel-handler/Jenkinsfile
+++ b/packages/aws-gateway-load-balancer-tunnel-handler/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
def pkgList = [
['name': 'aws-gateway-load-balancer-tunnel-handler',
diff --git a/packages/ddclient/Jenkinsfile b/packages/ddclient/Jenkinsfile
index a3decfa8..94d9a7be 100644
--- a/packages/ddclient/Jenkinsfile
+++ b/packages/ddclient/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
def pkgList = [
['name': 'ddclient',
diff --git a/packages/dropbear/Jenkinsfile b/packages/dropbear/Jenkinsfile
index a15793d1..1b7947cf 100644
--- a/packages/dropbear/Jenkinsfile
+++ b/packages/dropbear/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
def pkgList = [
['name': 'dropbear',
diff --git a/packages/frr/Jenkinsfile b/packages/frr/Jenkinsfile
index 269aaf9f..96432b8c 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 'sagitta' 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@sagitta')_
def pkgList = [
['name': 'libyang',
diff --git a/packages/hostap/Jenkinsfile b/packages/hostap/Jenkinsfile
index 91465cf6..b22e2409 100644
--- a/packages/hostap/Jenkinsfile
+++ b/packages/hostap/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
def pkgList = [
['name': 'wpa',
diff --git a/packages/hsflowd/Jenkinsfile b/packages/hsflowd/Jenkinsfile
index a0e4ecd9..39b6cfc2 100644
--- a/packages/hsflowd/Jenkinsfile
+++ b/packages/hsflowd/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
// NOTE: we can build with -d as the libbpf dependency is installed manually
// and not via a DEB package
diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile
index 73da9464..61addb40 100644
--- a/packages/linux-kernel/Jenkinsfile
+++ b/packages/linux-kernel/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
def pkgList = [
// The Linux Kernel
diff --git a/packages/ndppd/Jenkinsfile b/packages/ndppd/Jenkinsfile
index f112ae38..992cb2b1 100644
--- a/packages/ndppd/Jenkinsfile
+++ b/packages/ndppd/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
// NOTE: we can build with -d as the libbpf dependency is installed manually
// and not via a DEB package
diff --git a/packages/netfilter/Jenkinsfile b/packages/netfilter/Jenkinsfile
index 9578180d..f7496bdb 100644
--- a/packages/netfilter/Jenkinsfile
+++ b/packages/netfilter/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
def pkgList = [
// libnftnl
diff --git a/packages/opennhrp/Jenkinsfile b/packages/opennhrp/Jenkinsfile
index 637bcecb..8f5183e2 100644
--- a/packages/opennhrp/Jenkinsfile
+++ b/packages/opennhrp/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
def pkgList = [
['name': 'opennhrp',
diff --git a/packages/openvpn-otp/Jenkinsfile b/packages/openvpn-otp/Jenkinsfile
index 9e0de629..302b42ab 100644
--- a/packages/openvpn-otp/Jenkinsfile
+++ b/packages/openvpn-otp/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
// NOTE: we can build with -d as the libbpf dependency is installed manually
// and not via a DEB package
diff --git a/packages/owamp/Jenkinsfile b/packages/owamp/Jenkinsfile
index 2666abd0..0a0581af 100644
--- a/packages/owamp/Jenkinsfile
+++ b/packages/owamp/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
// NOTE: we can build with -d as the libbpf dependency is installed manually
// and not via a DEB package
diff --git a/packages/pam_tacplus/Jenkinsfile b/packages/pam_tacplus/Jenkinsfile
index 89a5d529..3ac6909a 100644
--- a/packages/pam_tacplus/Jenkinsfile
+++ b/packages/pam_tacplus/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
def pkgList = [
['name': 'pam_tacplus-debian',
diff --git a/packages/pyhumps/Jenkinsfile b/packages/pyhumps/Jenkinsfile
index 523ffdde..fd441846 100644
--- a/packages/pyhumps/Jenkinsfile
+++ b/packages/pyhumps/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
def pkgList = [
['name': 'humps',
diff --git a/packages/strongswan/Jenkinsfile b/packages/strongswan/Jenkinsfile
index 13d6dd6c..f246ad62 100644
--- a/packages/strongswan/Jenkinsfile
+++ b/packages/strongswan/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
def pkgList = [
['name': 'strongswan',
diff --git a/packages/telegraf/Jenkinsfile b/packages/telegraf/Jenkinsfile
index b0bdd07e..95781923 100644
--- a/packages/telegraf/Jenkinsfile
+++ b/packages/telegraf/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
// NOTE: we can build with -d as the libbpf dependency is installed manually
// and not via a DEB package
diff --git a/packages/vpp/Jenkinsfile b/packages/vpp/Jenkinsfile
index 93c6c031..df95b60d 100644
--- a/packages/vpp/Jenkinsfile
+++ b/packages/vpp/Jenkinsfile
@@ -15,10 +15,10 @@
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
def package_name = 'vpp'
diff --git a/packages/wide-dhcpv6/Jenkinsfile b/packages/wide-dhcpv6/Jenkinsfile
index 83954d97..a36273fd 100644
--- a/packages/wide-dhcpv6/Jenkinsfile
+++ b/packages/wide-dhcpv6/Jenkinsfile
@@ -14,10 +14,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
@NonCPS
-// Using a version specifier library, use 'current' branch. The underscore (_)
+// Using a version specifier library, use 'sagitta' 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@sagitta')_
def pkgList = [
['name': 'wide-dhcpv6',
diff --git a/scripts/list-package-arch b/scripts/list-package-arch
index 10ac02d3..c9a88654 100755
--- a/scripts/list-package-arch
+++ b/scripts/list-package-arch
@@ -2,6 +2,6 @@
# Execute this script from the vyos-build top directory
# Will generate a list of architectures in each repository
for a in $(echo vyos-build; ./scripts/build-packages -l | egrep -e '^ \* ' | sed 's/^ \* //'); do
- n=$(curl https://raw.githubusercontent.com/vyos/${a}/current/debian/control 2>/dev/null | grep "Architecture" | tr '\n' ',')
+ n=$(curl https://raw.githubusercontent.com/vyos/${a}/sagitta/debian/control 2>/dev/null | grep "Architecture" | tr '\n' ',')
printf "%-24s %s \n" "${a}" "${n}"
done
diff --git a/tools/get_latest_iso.py b/tools/get_latest_iso.py
index 4a2ea9a8..f8228ff2 100755
--- a/tools/get_latest_iso.py
+++ b/tools/get_latest_iso.py
@@ -7,7 +7,7 @@ from urllib.parse import unquote
import requests
BASE_URL = 'https://downloads.vyos.io/'
-PAGE_URL = BASE_URL+'?dir=rolling/current/amd64'
+PAGE_URL = BASE_URL+'?dir=rolling/sagitta/amd64'
def download():
diff --git a/vars/buildPackage.groovy b/vars/buildPackage.groovy
index 9e1ba1db..f000043f 100644
--- a/vars/buildPackage.groovy
+++ b/vars/buildPackage.groovy
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
-// Copyright (C) 2020-2021 VyOS maintainers and contributors
+// Copyright (C) 2020-2023 VyOS maintainers and contributors
//
// This program is free software; you can redistribute it and/or modify
// in order to easy exprort images built to "external" world
@@ -56,7 +56,7 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false, changesP
if (isPullRequest())
branchName = env.CHANGE_TARGET.toLowerCase()
if (branchName.equals('master'))
- branchName = 'current'
+ branchName = 'sagitta'
env.DOCKER_IMAGE = 'vyos/vyos-build:' + branchName
@@ -170,7 +170,7 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false, changesP
// every option over and over again!
def RELEASE = getGitBranchName()
if (getGitBranchName() == "master")
- RELEASE = 'current'
+ RELEASE = 'sagitta'
def VYOS_REPO_PATH = '/home/sentrium/web/dev.packages.vyos.net/public_html/repositories/' + RELEASE
if (getGitBranchName() == "crux")
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 09:02:13 +0000