Merge "deb_dpdk: add new 18.02.x branch"

[ci-management.git] / jjb / vpp / vpp.yaml

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 9dd12b5..b8b45fc 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -24,9 +24,6 @@
         - master:
             branch: 'master'
             repo-stream-part: 'master'
-        - test:
-            branch: 'stable/test'
-            repo-stream-part: 'stable.test'
         - '1710':
             branch: 'stable/1710'
             repo-stream-part: 'stable.1710'
@@ -47,9 +44,6 @@
         - master:
             branch: 'master'
             repo-stream-part: 'master'
-        - test:
-            branch: 'stable/test'
-            repo-stream-part: 'stable.test'
         - '1710':
             branch: 'stable/1710'
             repo-stream-part: 'stable.1710'
@@ -244,11 +238,15 @@
             branch: '{branch}'
 
     builders:
+        - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop'
+        - inject:
+            properties-file: variables.prop
         - shell:
             !include-raw-escape:
                 - include-raw-vpp-checkstyle.sh
         - shell:
             !include-raw-escape:
+                - ../scripts/setup_vpp_ubuntu_docker_test.sh
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
                 - include-raw-vpp-build.sh
         - shell:
@@ -336,6 +334,9 @@
                 notbuilt: false
 
     builders:
+        - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop'
+        - inject:
+            properties-file: variables.prop
         - shell:
             !include-raw-escape:
                 - ../scripts/setup_vpp_dpdk_dev_env.sh