Merge "CSIT-682 Usage of make-verify for vpp-csit-verify jobs"

diff --combined jjb/vpp/vpp.yaml
index 70f844f,f936158..4cd56a7
--- 1/jjb/vpp/vpp.yaml
--- 2/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@@ -35,9 -35,6 +35,9 @@@
          - '1704':
              branch: 'stable/1704'
              repo-stream-part: 'stable.1704'
 +        - '1707':
 +            branch: 'stable/1707'
 +            repo-stream-part: 'stable.1707'
      type:
          - short
          - long
@@@ -67,9 -64,6 +67,9 @@@
          - '1704':
              branch: 'stable/1704'
              repo-stream-part: 'stable.1704'
 +        - '1707':
 +            branch: 'stable/1707'
 +            repo-stream-part: 'stable.1707'
      os: ubuntu1604
  
  
@@@ -317,13 -311,15 +317,15 @@@
  
      builders:
          - shell:
-             !include-raw-escape: include-raw-vpp-checkstyle.sh
+             !include-raw-escape:
+                 - include-raw-vpp-checkstyle.sh
          - shell:
              !include-raw-escape:
                  - ../scripts/setup_vpp_dpdk_dev_env.sh
                  - include-raw-vpp-build.sh
          - shell:
-             !include-raw-escape: include-raw-vpp-csit-functional.sh
+             !include-raw-escape:
+                 - include-raw-vpp-csit-functional.sh
  
      publishers:
          - archive-artifacts:
@@@ -405,7 -401,8 +407,8 @@@
                  - ../scripts/setup_vpp_dpdk_dev_env.sh
                  - include-raw-vpp-build.sh
          - shell:
-             !include-raw-escape: include-raw-vpp-csit-verify-perf.sh
+             !include-raw-escape:
+                 - include-raw-vpp-csit-verify-perf.sh
  
      publishers:
          - archive-artifacts: