Merge "Purge un-needed references to lithium stream"

[releng/builder.git] / jjb / opflex / opflex-custom.yaml

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index f87e9202e9b56bbcff2be4f56c23bee88aa0b382..205558f392db7149c36baa64fe5d5b107ee560e8 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -6,21 +6,19 @@
 #        - 'opflex-daily-{stream}'
 #        - 'opflex-distribution-{stream}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
+            jdk: openjdk8
+        - boron:
+            branch: 'stable/boron'
+            jdk: openjdk8
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
+            jdk: openjdk8
 
     project: 'opflex'
+    archive-artifacts: '**/*.tar.gz'
 
 - builder:
     name: opflex-build
@@ -45,19 +43,10 @@
 - job-template:
     name: 'opflex-verify-{stream}'
 
-    project-type: matrix
-    node: matrix_master
+    project-type: freestyle
+    node: centos7-java-builder-2c-8g
     concurrent: true
-
-    axes:
-        - axis:
-            type: slave
-            name: nodes
-            values:
-                - dynamic_verify
-        - axis:
-            type: jdk
-            values: '{obj:jdks}'
+    jdk: '{jdk}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -66,24 +55,20 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -98,11 +83,13 @@
     publishers:
         - email-notification:
             email-prefix: '[opflex]'
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'opflex-merge-{stream}'
 
-    node: dynamic_merge
+    node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
     logrotate:
@@ -112,24 +99,20 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: ''
             choosing-strategy: 'default'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -144,5 +127,5 @@
     publishers:
         - email-notification:
             email-prefix: '[opflex]'
-        - archive:
-            artifacts: '**/*.tar.gz'
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'