Remove {project}-integration-{stream} jobs

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

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index f8383a8b8c85e012784d0490a059fab402e5faad..3dd2638f4d46849b28310e865e566c9fe30c2ea6 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,68 +1,71 @@
 ---
+- project:
+    name: bier-oxygen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: oxygen
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    mvn-settings: 'bier-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
 - project:
     name: bier-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'bier'
     project-name: 'bier'
-    branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[bier]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
 
 - project:
     name: bier-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}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'bier'
     project-name: 'bier'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[bier]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
 
 - project:
     name: bier-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'