aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2023-06-06 15:57:40 +0200
committerHarald Welte <laforge@osmocom.org>2023-06-06 16:29:31 +0200
commit79c5c2d7f7791dff7a0ff293b142501eba4f6e8d (patch)
tree6ce13bdc776db3c345c121ddbfbbe8b39f6fa2a9
parent5bc3e0587ac3b2fbb47913f3af4704f7d13a8a58 (diff)
DAHDI master build diversification
* we never really wanted to build against fixed tags but branches, i.e. "the latest tag within a given stable series", so switch from a fixed tag like "v5.10" in torvalds/linux.git to "linux-5.10.y" in stable/linux.git * we also want to build against 6.1.y, as that is what upcoming Debian bookworm will ship Change-Id: Ibc0527a6f7d11c4f99c19e73c948b9baacd4e5a2
-rw-r--r--jobs/master-builds-dahdi.yml23
1 files changed, 17 insertions, 6 deletions
diff --git a/jobs/master-builds-dahdi.yml b/jobs/master-builds-dahdi.yml
index 37d48b7..8a39c32 100644
--- a/jobs/master-builds-dahdi.yml
+++ b/jobs/master-builds-dahdi.yml
@@ -1,14 +1,25 @@
- project:
- name: master-builds-dahdi-linux
+ name: master-builds-dahdi-linux-stable
+ type: stable
+ repo: 'https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git'
+ linux-ver:
+ - "linux-4.19.y"
+ - "linux-5.10.y"
+ - "linux-6.1.y"
+ jobs:
+ - 'master-dahdi-linux-{type}-{linux-ver}'
+
+- project:
+ name: master-builds-dahdi-linux-torvalds
+ type: torvalds
+ repo: 'https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
linux-ver:
- - "v4.19"
- - "v5.10"
- "master"
jobs:
- - 'master-dahdi-linux-{linux-ver}'
+ - 'master-dahdi-linux-{type}-{linux-ver}'
- job-template:
- name: 'master-dahdi-linux-{linux-ver}'
+ name: 'master-dahdi-linux-{type}-{linux-ver}'
project-type: freestyle
node: osmocom-master
concurrent: true
@@ -31,7 +42,7 @@
# the shell part below.
- git:
basedir: 'linux'
- url: 'https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
+ url: '{repo}'
branches:
- '{linux-ver}'
refspec: '{linux-ver}'