summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-01-10 00:49:29 +0100
committerChristian Poessinger <christian@poessinger.com>2021-01-10 00:58:57 +0100
commit30b4da48dc180d0cebb5428a590ccaf533c212f1 (patch)
tree1b3d206e38a467d9ca11fc30be62ae0e3568d373 /packages
parent50c5f3669c5c399cfa233ea568cee4210a911d1e (diff)
downloadvyos-build-30b4da48dc180d0cebb5428a590ccaf533c212f1.tar.gz
vyos-build-30b4da48dc180d0cebb5428a590ccaf533c212f1.zip
Jenkins: Kernel: extract version from data/defaults.json
No need to specify the kernel version two times, it can be retrieved from data/defaults.json (cherry picked from commit 2af09cfd180a4cc86aaca430a1c95d8c4b7a3d9b)
Diffstat (limited to 'packages')
-rw-r--r--packages/linux-kernel/Jenkinsfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile
index cec41934..5736f994 100644
--- a/packages/linux-kernel/Jenkinsfile
+++ b/packages/linux-kernel/Jenkinsfile
@@ -90,7 +90,7 @@ pipeline {
script {
dir(env.BASE_DIR) {
sh '''
- KERNEL_VER='5.4.88'
+ KERNEL_VER=\$(cat ../../data/defaults.json | jq -r .kernel_version)
gpg2 --locate-keys torvalds@kernel.org gregkh@kernel.org
curl -OL https://www.kernel.org/pub/linux/kernel/v5.x/linux-${KERNEL_VER}.tar.xz
curl -OL https://www.kernel.org/pub/linux/kernel/v5.x/linux-${KERNEL_VER}.tar.sign
@@ -301,7 +301,7 @@ pipeline {
VYOS_REPO_PATH += 'vyos/'
def SSH_OPTS = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR'
- def SSH_REMOTE = 'khagen@10.217.48.113'
+ def SSH_REMOTE = env.DOWNLOADS_VYOS_IO_HOST // defined as global variable
echo "Uploading package(s) and updating package(s) in the repository ..."