Include war location fix and remove limits.conf reference

Jenkinsfile

@@ -1,7 +1,13 @@
-properties([
+def jobProperties = [
   buildDiscarder(logRotator(numToKeepStr: '50', artifactNumToKeepStr: '5')),
   disableConcurrentBuilds(abortPrevious: true)
-])
+]
+
+if (env.BRANCH_IS_PRIMARY) {
+  jobProperties << pipelineTriggers([cron('@weekly')]) // Run at least weekly on the primary branch to assure we test recent releases
+}
+
+properties(jobProperties)
 
 podTemplate(yaml: readTrusted('KubernetesPod.yaml'), workingDir: '/home/jenkins/agent') {
   nodeWithTimeout(POD_LABEL) {

systemd/jenkins.service

@@ -125,19 +125,15 @@ Environment="JENKINS_PORT=@@PORT@@"
 #Environment="JENKINS_OPTS="
 
 # Maximum core file size. If unset, the value from the OS is inherited.
-# The default limit comes from /etc/security/limits.conf.
 #LimitCORE=infinity
 
 # Maximum file size. If unset, the value from the OS is inherited.
-# The default limit comes from /etc/security/limits.conf.
 #LimitFSIZE=infinity
 
 # File descriptor limit. If unset, the value from the OS is inherited.
-# The default limit comes from /etc/security/limits.conf.
 #LimitNOFILE=8192
 
 # Maximum number of processes. If unset, the value from the OS is inherited.
-# The default limit comes from /etc/security/limits.conf.
 #LimitNPROC=32768
 
 # Set the umask to control the permission bits of files that Jenkins creates.

systemd/jenkins.sh

@@ -34,6 +34,8 @@ infer_java_cmd() {
 }
 
 check_java_version() {
+	printf '%s' "${JENKINS_OPTS}" | grep -q '\--enable-future-java' && return 0
+
 	java_version=$("${JENKINS_JAVA_CMD}" -version 2>&1 |
 		sed -n ';s/.* version "\([0-9]\{2,\}\|[0-9]\.[0-9]\)\..*".*/\1/p;')
 
@@ -120,11 +122,11 @@ main() {
 
 	infer_java_cmd || die 'failed to find a valid Java installation'
 
-	check_java_version ||
-		die "invalid java version: $("${JENKINS_JAVA_CMD}" -version)"
-
 	infer_jenkins_opts
 
+	check_java_version ||
+		die "invalid Java version: $("${JENKINS_JAVA_CMD}" -version 2>&1)"
+
 	java_opts_tmp="${JAVA_OPTS}"
 	unset JAVA_OPTS
 	unset JENKINS_DEBUG_LEVEL

systemd/migrate.sh

@@ -196,6 +196,10 @@ read_old_options() {
 		NEW_JENKINS_WAR="${JENKINS_WAR}"
 	fi
 	if [ "${NEW_JENKINS_WAR}" = "/usr/share/@@ARTIFACTNAME@@/@@ARTIFACTNAME@@.war" ]; then
+		# deb
+		NEW_JENKINS_WAR="${NEW_JENKINS_WAR_DEFAULT}"
+	elif [ "${NEW_JENKINS_WAR}" = "/usr/lib/@@ARTIFACTNAME@@/@@ARTIFACTNAME@@.war" ]; then
+		# rpm
 		NEW_JENKINS_WAR="${NEW_JENKINS_WAR_DEFAULT}"
 	fi