Rollback linter job

[ci-management.git] / jjb / global-templates-java.yaml

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 0995147..7224b75 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -18,6 +18,7 @@
     pom:
     mvn-opts: ''
     java-opts: ''
+    java-version: openjdk8
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -52,6 +53,8 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -112,6 +115,25 @@
     <<: *verify_java_defaults
     name: '{project-name}-{stream}-{subproject}-verify-java'
 
+- job-template:
+    # Job template for Java integration pairwise jobs
+    #
+    # The purpose of this job template is to run:
+    # 1. maven clean install
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    <<: *verify_java_defaults
+    name: '{project-name}-{stream}-integration-pairwise'
+    triggers:
+      - timed: '@daily'
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{obj:pattern}'
+
 - job-template:
     # Job template for Java daily release jobs
     #
@@ -350,6 +372,7 @@
     mvn-params: ''
     mvn-opts: ''
     java-opts: ''
+    java-version: openjdk8
 
     properties:
       - infra-properties:
@@ -383,6 +406,8 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -790,7 +815,7 @@
 
     name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: 'ubuntu1804-docker-8c-8g'
     disabled: '{disabled}'
     properties:
       - infra-properties: