Merge "Don't double archive robot log.html files"

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

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index 2d2e0aaf2660f0421a6392cf600cb280c0c4498d..b772ead2e8fb6b2d6f17129aea1e0bb871423f14 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -6,26 +6,22 @@
       - 'opflex-rapidjson-{stream}'
       - 'opflex-openvswitch-{stream}'
 
-    # todo: remove 'ovs-scm' after boron EOL
     stream:
       - oxygen:
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-          ovs-scm: v2
       - nitrogen:
           branch: 'stable/nitrogen'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-          ovs-scm: v2
       - carbon:
           branch: 'stable/carbon'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-          ovs-scm: v2
 
     project: 'opflex'
 
@@ -41,7 +37,7 @@
     name: 'opflex-libuv-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: true
 
     group-id: 'libuv'
@@ -96,7 +92,7 @@
     name: 'opflex-rapidjson-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: true
 
     group-id: 'rapidjson'
@@ -151,7 +147,7 @@
     name: 'opflex-openvswitch-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: true
 
     group-id: 'openvswitch'
@@ -179,7 +175,7 @@
           description: 'openvswitch-version'
 
     scm:
-      - git-opflex-ovs-{ovs-scm}
+      - git-opflex-ovs-v2
 
     wrappers:
       - opendaylight-infra-wrappers: