Merge "Update build timeout for docker image to 60m"

[releng/builder.git] / jjb / yangtools / yangtools.yaml

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index d459f652cc16486e38bb9dfee19c3d8437237c68..3573a6aac4bf9ce8edd187ed5dd24b77159821e1 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -12,7 +12,6 @@
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -38,7 +37,7 @@
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'v1.2.x'
-    jdk: openjdk8
+    distribution_branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -65,7 +64,6 @@
     project-name: 'yangtools'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -78,35 +76,6 @@
     email-upstream: '[yangtools] [odlparent]'
     archive-artifacts: ''
 
-- project:
-    name: yangtools-boron
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: boron
-    project: 'yangtools'
-    project-name: 'yangtools'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn32:
-          mvn-version: 'mvn32'
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'yangtools-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[yangtools] [odlparent]'
-    archive-artifacts: ''
-
 - project:
     name: yangtools-sonar
     jobs: