From 2af09cfd180a4cc86aaca430a1c95d8c4b7a3d9b Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 10 Jan 2021 00:49:29 +0100
Subject: 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
---
packages/linux-kernel/Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile
index 6d9d9cda..57eeea59 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.10.6'
+ 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
@@ -263,7 +263,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 ..."
--
cgit v1.2.3