From f0145bcc97efc1420bc5be4a196778723f461949 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 27 Feb 2020 07:24:46 +0100
Subject: lts tweaks

---
 jenkinsfile.kernel.lts    | 81 -----------------------------------------------
 jenkinsfile.kernel.lts49  | 81 +++++++++++++++++++++++++++++++++++++++++++++++
 jenkinsfile.kernel.lts54  | 81 +++++++++++++++++++++++++++++++++++++++++++++++
 scripts/prepare-kernel.sh |  4 +--
 4 files changed, 164 insertions(+), 83 deletions(-)
 delete mode 100644 jenkinsfile.kernel.lts
 create mode 100644 jenkinsfile.kernel.lts49
 create mode 100644 jenkinsfile.kernel.lts54

diff --git a/jenkinsfile.kernel.lts b/jenkinsfile.kernel.lts
deleted file mode 100644
index 600225d..0000000
--- a/jenkinsfile.kernel.lts
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env groovy
-/*
- * job name: kernel-lts
- */
-
-def KernelSource() {
-    dir ('source') {
-	checkout([
-	    $class: 'GitSCM',
-	    branches: [
-		[ name: '*/linux-4.19.y' ]
-	    ],
-	    extensions: [
-		[
-		    $class: 'CloneOption',
-		    timeout: 60
-		]
-	    ],
-	    userRemoteConfigs: [
-		[ url: 'git://spunk.home.kraxel.org/linux-stable' ]
-	    ]])
-    }
-}
-
-def KernelRPMBuild() {
-    sh '''
-	scripts/prepare-kernel.sh
-	scripts/rpm-build.sh -ba kernel.spec
-	createrepo rpms
-	'''
-    archiveArtifacts 'rpms/*/*'
-}
-
-def KernelCleanup() {
-    dir ("build") {
-	deleteDir()
-    }
-    dir ("buildroot") {
-	deleteDir()
-    }
-    dir ("rpms") {
-	deleteDir()
-    }
-}
-
-pipeline {
-    agent {
-	node 'dist-rhel-7-x86_64'
-    }
-
-    options {
-	buildDiscarder(logRotator(numToKeepStr: '3'))
-	disableConcurrentBuilds()
-    }
-
-    triggers {
-	pollSCM('H * * * *')
-    }
-
-    stages {
-
-	stage ('Prepare') {
-	    steps {
-		KernelSource();
-	    }
-	}
-
-	stage ("RPM Build") {
-	    steps {
-		KernelRPMBuild()
-	    }
-	}
-
-	stage ("Cleanup") {
-	    steps {
-		KernelCleanup()
-	    }
-	}
-
-    }
-}
diff --git a/jenkinsfile.kernel.lts49 b/jenkinsfile.kernel.lts49
new file mode 100644
index 0000000..600225d
--- /dev/null
+++ b/jenkinsfile.kernel.lts49
@@ -0,0 +1,81 @@
+#!/usr/bin/env groovy
+/*
+ * job name: kernel-lts
+ */
+
+def KernelSource() {
+    dir ('source') {
+	checkout([
+	    $class: 'GitSCM',
+	    branches: [
+		[ name: '*/linux-4.19.y' ]
+	    ],
+	    extensions: [
+		[
+		    $class: 'CloneOption',
+		    timeout: 60
+		]
+	    ],
+	    userRemoteConfigs: [
+		[ url: 'git://spunk.home.kraxel.org/linux-stable' ]
+	    ]])
+    }
+}
+
+def KernelRPMBuild() {
+    sh '''
+	scripts/prepare-kernel.sh
+	scripts/rpm-build.sh -ba kernel.spec
+	createrepo rpms
+	'''
+    archiveArtifacts 'rpms/*/*'
+}
+
+def KernelCleanup() {
+    dir ("build") {
+	deleteDir()
+    }
+    dir ("buildroot") {
+	deleteDir()
+    }
+    dir ("rpms") {
+	deleteDir()
+    }
+}
+
+pipeline {
+    agent {
+	node 'dist-rhel-7-x86_64'
+    }
+
+    options {
+	buildDiscarder(logRotator(numToKeepStr: '3'))
+	disableConcurrentBuilds()
+    }
+
+    triggers {
+	pollSCM('H * * * *')
+    }
+
+    stages {
+
+	stage ('Prepare') {
+	    steps {
+		KernelSource();
+	    }
+	}
+
+	stage ("RPM Build") {
+	    steps {
+		KernelRPMBuild()
+	    }
+	}
+
+	stage ("Cleanup") {
+	    steps {
+		KernelCleanup()
+	    }
+	}
+
+    }
+}
diff --git a/jenkinsfile.kernel.lts54 b/jenkinsfile.kernel.lts54
new file mode 100644
index 0000000..fae3099
--- /dev/null
+++ b/jenkinsfile.kernel.lts54
@@ -0,0 +1,81 @@
+#!/usr/bin/env groovy
+/*
+ * job name: kernel-lts
+ */
+
+def KernelSource() {
+    dir ('source') {
+	checkout([
+	    $class: 'GitSCM',
+	    branches: [
+		[ name: '*/linux-5.4.y' ]
+	    ],
+	    extensions: [
+		[
+		    $class: 'CloneOption',
+		    timeout: 60
+		]
+	    ],
+	    userRemoteConfigs: [
+		[ url: 'git://spunk.home.kraxel.org/linux-stable' ]
+	    ]])
+    }
+}
+
+def KernelRPMBuild() {
+    sh '''
+	scripts/prepare-kernel.sh
+	scripts/rpm-build.sh -ba kernel.spec
+	createrepo rpms
+	'''
+    archiveArtifacts 'rpms/*/*'
+}
+
+def KernelCleanup() {
+    dir ("build") {
+	deleteDir()
+    }
+    dir ("buildroot") {
+	deleteDir()
+    }
+    dir ("rpms") {
+	deleteDir()
+    }
+}
+
+pipeline {
+    agent {
+	node 'dist-rhel-7-x86_64'
+    }
+
+    options {
+	buildDiscarder(logRotator(numToKeepStr: '3'))
+	disableConcurrentBuilds()
+    }
+
+    triggers {
+	pollSCM('H * * * *')
+    }
+
+    stages {
+
+	stage ('Prepare') {
+	    steps {
+		KernelSource();
+	    }
+	}
+
+	stage ("RPM Build") {
+	    steps {
+		KernelRPMBuild()
+	    }
+	}
+
+	stage ("Cleanup") {
+	    steps {
+		KernelCleanup()
+	    }
+	}
+
+    }
+}
diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
index d5cbb69..d28263f 100755
--- a/scripts/prepare-kernel.sh
+++ b/scripts/prepare-kernel.sh
@@ -5,8 +5,8 @@ version="${tag#v}"
 rpmvers="${version}"
 release="${BUILD_NUMBER}"
 case $version in
-4.19.*)	variant="lts";;
-5.4.*)	variant="lts";;
+4.19.*)	variant="lts419";;
+5.4.*)	variant="lts54";;
 *-rc*)	variant="candidate"
 	rpmvers="${version%-*}.0"
 	release="0.${version#*-}.${release}"
-- 
cgit