X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopflex%2Fopflex-dependencies.yaml;h=963228095cda3832b30d5d5936d45db318355d53;hb=29b2f25826a1d889aa515be1c39c40da83f7ae00;hp=41795f9a7db933cbe854380ee8170463fb20e6a1;hpb=b8eea3835e3eaedae870e763d58397dd4428bc97;p=releng%2Fbuilder.git

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index 41795f9a7..963228095 100644
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -1,49 +1,105 @@
+---
 - project:
     name: opflex-dependencies
     jobs:
-        - 'opflex-libuv_tgz-{stream}'
-        - 'opflex-rapidjson_tgz-{stream}'
-        - 'opflex-openvswitch_tgz-{stream}'
+      - 'opflex-libuv_tgz-{stream}'
+      - 'opflex-rapidjson_tgz-{stream}'
+      - 'opflex-openvswitch_tgz-{stream}'
 
     stream:
-        - carbon:
-            branch: 'master'
-            jdk: openjdk7
-        - boron:
-            branch: 'stable/boron'
-            jdk: openjdk7
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
+      - oxygen:
+          branch: 'master'
+          libuv-build: v1
+          libuv-scm: v2
+          rapidjson-build: v1
+          rapidjson-scm: v2
+          openvswitch-build: v2
+          openvswitch-scm: v2
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          libuv-build: v1
+          libuv-scm: v2
+          rapidjson-build: v1
+          rapidjson-scm: v2
+          openvswitch-build: v2
+          openvswitch-scm: v2
+      - carbon:
+          branch: 'stable/carbon'
+          libuv-build: v1
+          libuv-scm: v2
+          rapidjson-build: v1
+          rapidjson-scm: v2
+          openvswitch-build: v2
+          openvswitch-scm: v2
+      - boron:
+          branch: 'stable/boron'
+          libuv-build: v1
+          libuv-scm: v1
+          rapidjson-build: v1
+          rapidjson-scm: v1
+          openvswitch-build: v1
+          openvswitch-scm: v1
 
     project: 'opflex'
 
 - scm:
-    name: 'git-opflex-libuv'
+    name: 'git-opflex-libuv-v1'
     scm:
-        - git:
-            url: https://github.com/libuv/libuv.git
-            branches:
-                - 'refs/tags/v1.7.5'
-            wipe-workspace: true
+      - git:
+          url: https://github.com/libuv/libuv.git
+          branches:
+            - 'refs/tags/v1.7.5'
+          wipe-workspace: true
 
 - scm:
-    name: 'git-opflex-rapidjson'
+    name: 'git-opflex-libuv-v2'
     scm:
-        - git:
-            url: https://github.com/miloyip/rapidjson.git
-            branches:
-                - 'refs/tags/v1.0.1'
-            wipe-workspace: true
+      - git:
+          url: https://github.com/libuv/libuv.git
+          branches:
+            - 'refs/tags/v1.8.0'
+          wipe-workspace: true
 
 - scm:
-    name: 'git-opflex-ovs'
+    name: 'git-opflex-rapidjson-v1'
     scm:
-        - git:
-            url: https://github.com/noironetworks/ovs.git
-            branches:
-                - 'origin/noiro'
-            wipe-workspace: true
+      - git:
+          url: https://github.com/miloyip/rapidjson.git
+          branches:
+            - 'refs/tags/v1.0.1'
+          wipe-workspace: true
+
+- scm:
+    name: 'git-opflex-rapidjson-v2'
+    scm:
+      - git:
+          url: https://github.com/miloyip/rapidjson.git
+          branches:
+            - 'refs/tags/v1.0.2'
+          wipe-workspace: true
+
+- scm:
+    name: 'git-opflex-ovs-v1'
+    scm:
+      - git:
+          url: https://github.com/noironetworks/ovs.git
+          branches:
+            - 'origin/noiro'
+          wipe-workspace: true
+
+- scm:
+    name: 'git-opflex-ovs-v2'
+    scm:
+      - git:
+          url: https://github.com/openvswitch/ovs.git
+          branches:
+            - 'refs/tags/v2.6.0'
+          wipe-workspace: true
+
+- builder:
+    name: 'builder-opflex-libuv-v1'
+    builders:
+      - shell: !include-raw-escape: deps-inc-v1/libuv_tgz-build.sh
 
 - job-template:
     name: 'opflex-libuv_tgz-{stream}'
@@ -52,29 +108,31 @@
     node: centos7-java-builder-2c-8g
     concurrent: true
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
 
     scm:
-        - git-opflex-libuv
+      - git-opflex-libuv-{libuv-scm}
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-libuv_tgz-build.sh
+      - builder-opflex-libuv-{libuv-build}
 
     publishers:
-        - email-notification:
-            email-prefix: '[opflex]'
-        - archive:
-            artifacts: 'install-root/*.tgz'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[opflex]'
+      - archive:
+          artifacts: 'install-root/*.tgz'
+
+- builder:
+    name: 'builder-opflex-rapidjson-v1'
+    builders:
+      - shell: !include-raw-escape: deps-inc-v1/rapidjson_tgz-build.sh
 
 - job-template:
     name: 'opflex-rapidjson_tgz-{stream}'
@@ -83,29 +141,36 @@
     node: centos7-java-builder-2c-8g
     concurrent: true
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
 
     scm:
-        - git-opflex-rapidjson
+      - git-opflex-rapidjson-{rapidjson-scm}
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-rapidjson_tgz-build.sh
+      - builder-opflex-rapidjson-{rapidjson-build}
 
     publishers:
-        - email-notification:
-            email-prefix: '[opflex]'
-        - archive:
-            artifacts: 'install-root/*.tgz'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[opflex]'
+      - archive:
+          artifacts: 'install-root/*.tgz'
+
+- builder:
+    name: 'builder-opflex-openvswitch-v1'
+    builders:
+      - shell: !include-raw: deps-inc-v1/openvswitch_tgz-build.sh
+
+- builder:
+    name: 'builder-opflex-openvswitch-v2'
+    builders:
+      - shell: !include-raw: deps-inc-v2/openvswitch_tgz-build.sh
 
 - job-template:
     name: 'opflex-openvswitch_tgz-{stream}'
@@ -114,26 +179,23 @@
     node: centos7-java-builder-2c-8g
     concurrent: true
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
 
     scm:
-        - git-opflex-ovs
+      - git-opflex-ovs-{openvswitch-scm}
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-openvswitch_tgz-build.sh
+      - builder-opflex-openvswitch-{openvswitch-build}
 
     publishers:
-        - email-notification:
-            email-prefix: '[opflex]'
-        - archive:
-            artifacts: 'install-root/*.tgz'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[opflex]'
+      - archive:
+          artifacts: 'install-root/*.tgz'