diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-01-09 13:43:24 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-01-09 13:43:24 +0100 |
| commit | afa7d9b3bac98623028085007c8c8fbf2a2713d2 (patch) | |
| tree | e9627ffbdc724de63662626cede0970815acf3e4 /packages/linux-kernel/Jenkinsfile | |
| parent | 3ded1cdb3b636450c20985c6e83a5255b5db9e9b (diff) | |
| parent | 21b441b75a8e96628751a9b12a10660947752ad0 (diff) | |
| download | vyos-build-afa7d9b3bac98623028085007c8c8fbf2a2713d2.tar.gz vyos-build-afa7d9b3bac98623028085007c8c8fbf2a2713d2.zip | |
Merge branch 'kernel-5.10' into current
* kernel-5.10:
QAT: update to 1.7.l.4.12.0
Kernel: Initial support for 5.10.4
Diffstat (limited to 'packages/linux-kernel/Jenkinsfile')
| -rw-r--r-- | packages/linux-kernel/Jenkinsfile | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile index 4d163ca3..a21a1862 100644 --- a/packages/linux-kernel/Jenkinsfile +++ b/packages/linux-kernel/Jenkinsfile @@ -92,7 +92,7 @@ pipeline { doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CleanCheckout'], [$class: 'CloneOption', depth: 1, noTags: false, reference: '', shallow: true]], - branches: [[name: 'v5.4.86' ]], + branches: [[name: 'v5.10.5' ]], userRemoteConfigs: [[credentialsId: 'GitHub-vyosbot', url: 'https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git']]]) } } @@ -118,26 +118,6 @@ pipeline { } } } - stage('WireGuard') { - when { - beforeOptions true - beforeAgent true - anyOf { - changeset pattern: "${env.CHANGESET_DIR}" - triggeredBy 'TimerTrigger' - triggeredBy cause: "UserIdCause" - } - } - steps { - dir(env.BASE_DIR + '/wireguard-linux-compat') { - checkout([$class: 'GitSCM', - doGenerateSubmoduleConfigurations: false, - extensions: [[$class: 'CleanCheckout']], - branches: [[name: 'debian/1.0.20201112-1_bpo10+1' ]], - userRemoteConfigs: [[credentialsId: 'GitHub-vyosbot', url: 'https://salsa.debian.org/debian/wireguard-linux-compat.git']]]) - } - } - } stage('Accel-PPP') { when { beforeOptions true @@ -179,24 +159,6 @@ pipeline { stage('Kernel Module(s)') { parallel { - stage('WireGuard') { - when { - beforeOptions true - beforeAgent true - anyOf { - changeset pattern: "${env.CHANGESET_DIR}" - triggeredBy 'TimerTrigger' - triggeredBy cause: "UserIdCause" - } - } - steps { - dir(env.BASE_DIR) { - // In Debian wireguard repo commit edb7124c866ea0e506278c311fc82dfde1f957be - // they decided to split source code of the kernel part and tools - sh "./build-wireguard-modules.sh" - } - } - } stage('Accel-PPP') { when { beforeOptions true |