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 7a44277af1c1b51e664a48f8cc4010b61b52e09e..3573a6aac4bf9ce8edd187ed5dd24b77159821e1 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -1,19 +1,17 @@
 ---
 - project:
-    name: yangtools-nitrogen
+    name: yangtools-oxygen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -27,21 +25,19 @@
     archive-artifacts: ''
 
 - project:
-    name: yangtools-carbon
+    name: yangtools-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'yangtools'
     project-name: 'yangtools'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'v1.2.x'
+    distribution_branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -55,26 +51,22 @@
     archive-artifacts: ''
 
 - project:
-    name: yangtools-boron
+    name: yangtools-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'yangtools'
     project-name: 'yangtools'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
-      - mvn32:
-          mvn-version: 'mvn32'
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'