Merge "Migrate tsdr matrix-verify jobs to freestyle-verify jobs"

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

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index d4a1d55e6a0339dbe0eca39a9f557bb9c4f0016c..a1b8ee813edc70486c853d12c5561550ae55eb5a 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -6,11 +6,16 @@
         - 'opflex-openvswitch_tgz-{stream}'
 
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'opflex'
 
@@ -45,7 +50,7 @@
     name: 'opflex-libuv_tgz-{stream}'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
 
     logrotate:
@@ -58,10 +63,8 @@
         - git-opflex-libuv
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     builders:
         - shell:
@@ -78,7 +81,7 @@
     name: 'opflex-rapidjson_tgz-{stream}'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
 
     logrotate:
@@ -91,10 +94,8 @@
         - git-opflex-rapidjson
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     builders:
         - shell:
@@ -111,7 +112,7 @@
     name: 'opflex-openvswitch_tgz-{stream}'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
 
     axes:
@@ -119,7 +120,7 @@
             type: slave
             name: nodes
             values:
-                - dynamic_verify
+                - centos7-java-builder-2c-8g
         - axis:
             type: jdk
             values: '{obj:jdks}'
@@ -134,10 +135,8 @@
         - git-opflex-ovs
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     builders:
         - shell: