Remove ARCHIVE_ARTIFACTS overwrite

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

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 11533fa56961fe6eb8d5053669cc645acb06fcc6..98abe518ae59d39cb420cb90cfb5ab61bb1fbede 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -2,26 +2,19 @@
 - project:
     name: genius-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-verify-dependencies
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'genius'
     project-name: 'genius'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
     dependencies: >
         controller-merge-{stream},
         yangtools-merge-{stream},
@@ -29,28 +22,23 @@
         openflowplugin-merge-{stream},
         neutron-merge-{stream}
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 96fb4b6d9d1ee
 
 - project:
     name: genius-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'genius'
     project-name: 'genius'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         controller-merge-{stream},
@@ -59,29 +47,24 @@
         openflowplugin-merge-{stream},
         neutron-merge-{stream}
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 96fb4b6d9d1ee
 
 - project:
     name: genius-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'genius'
     project-name: 'genius'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'genius-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         controller-merge-{stream},
@@ -90,15 +73,17 @@
         openflowplugin-merge-{stream},
         neutron-merge-{stream}
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 96fb4b6d9d1ee
 
 - project:
     name: genius-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'genius'
     project-name: 'genius'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'