Enable jobs for throttle branches

Change-Id: I70cd178f52480bcab2bd84b7bdb967f1799acdbd
Signed-off-by: Ed Warnicke <eaw@cisco.com>

2 files changed, 42 insertions, 31 deletions

diff --git a/jjb/vpp/include-raw-vpp-maven-push.sh b/jjb/vpp/include-raw-vpp-maven-push.sh
index 4d370942b..0cdf9bf36 100644
--- a/jjb/vpp/include-raw-vpp-maven-push.sh
+++ b/jjb/vpp/include-raw-vpp-maven-push.sh
@@ -10,18 +10,6 @@ MVN="${HOME}/tools/hudson.tasks.Maven_MavenInstallation/${MAVEN_SELECTOR}/bin/mv
 GROUP_ID="io.fd.${PROJECT}"
 BASEURL="${NEXUSPROXY}/content/repositories/fd.io."
 BASEREPOID='fdio-'
-declare -A REPO_TARGET
-REPOID_TARGET=(
-    [ubuntu1404]="${BASEREPOID}dev"
-    [ubuntu1604]="${BASEREPOID}ubuntu.xenial.main"
-    [centos7]="${BASEREPOID}yum"
-)
-declare -A REPOURL_TARGET
-REPOURL_TARGET=(
-    [ubuntu1404]="${BASEURL}dev"
-    [ubuntu1604]="${BASEURL}ubuntu.xenial.main"
-    [centos7]="${BASEURL}yum"
-)
 
 function push_file ()
 {
@@ -69,8 +57,8 @@ function push_jar ()
 function push_deb ()
 {
     debfile=$1
-    repoId=${REPOID_TARGET[${OS}]}
-    url="${REPOURL_TARGET[${OS}]}"
+    repoId=${REPO_NAME}
+    url="${BASEURL}${REPO_NAME}"
 
     basefile=$(basename -s .deb "$debfile")
     artifactId=$(echo "$basefile" | cut -f 1 -d '_')
@@ -82,8 +70,8 @@ function push_deb ()
 function push_rpm ()
 {
     rpmfile=$1
-    repoId=${REPOID_TARGET[${OS}]}
-    url="${REPOURL_TARGET[${OS}]}"
+    repoId=${REPO_NAME}
+    url="${BASEURL}${REPO_NAME}"
 
     if grep -qE '\.s(rc\.)?rpm' <<<"$rpmfile"
     then
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index e9815d9de..a5cfcd354 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -1,16 +1,28 @@
 - project:
     name: vpp
     jobs:
-        - 'vpp-verify-{branch}-{os}'
-        - 'vpp-merge-{branch}-{os}'
-        - 'vpp-verify-image-{branch}-{os}'
+        - 'vpp-verify-{stream}-{os}'
+        - 'vpp-merge-{stream}-{os}'
+        - 'vpp-verify-image-{stream}-{os}'
 
     project: 'vpp'
     os:
-        - ubuntu1404
-        - centos7
-        - ubuntu1604
-    branch: 'master'
+        - ubuntu1404:
+            repo-os-part: 'ubuntu.trusty.main'
+        - ubuntu1604:
+            repo-os-part: 'ubuntu.xenial.main'
+        - centos7:
+            repo-os-part: 'centos7'
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
+        - test:
+            branch: 'stable/test'
+            repo-stream-part: 'stable.test'
+        - '1606':
+            branch: 'stable/1606'
+            repo-stream-part: 'stable.1606'
     type:
         - short
         - long
@@ -18,10 +30,19 @@
 - project:
     name: vpp-misc
     jobs:
-        - 'vpp-csit-verify-virl'
-        - 'vpp-csit-verify-hw-perf-{type}'
+        - 'vpp-csit-verify-virl-{stream}'
+        - 'vpp-csit-verify-hw-perf-{stream}-{type}'
     project: 'vpp'
-    branch: 'master'
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
+        - test:
+            branch: 'stable/test'
+            repo-stream-part: 'stable.test'
+        - '1606':
+            branch: 'stable/1606'
+            repo-stream-part: 'stable.1606'
     os: ubuntu1404
     type:
         - all
@@ -29,7 +50,7 @@
         - long
 
 - job-template:
-    name: 'vpp-verify-{branch}-{os}'
+    name: 'vpp-verify-{stream}-{os}'
 
     project-type: freestyle
     node: 'verify-{os}'
@@ -70,7 +91,7 @@
             !include-raw-escape include-raw-vpp-build.sh
 
 - job-template:
-    name: 'vpp-verify-image-{branch}-{os}'
+    name: 'vpp-verify-image-{stream}-{os}'
 
     project-type: freestyle
     node: 'verify-image-{os}'
@@ -124,7 +145,7 @@
             !include-raw-escape include-raw-vpp-build.sh
 
 - job-template:
-    name: 'vpp-merge-{branch}-{os}'
+    name: 'vpp-merge-{stream}-{os}'
 
     project-type: freestyle
     node: 'merge-{os}'
@@ -144,6 +165,8 @@
             os: '{os}'
         - maven-project-parameter:
             maven: '{mvn33}'
+        - repo-name-parameter:
+            repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - gerrit-trigger-scm:
@@ -176,7 +199,7 @@
             !include-raw-escape include-raw-vpp-maven-push.sh
 
 - job-template:
-    name: 'vpp-csit-verify-virl'
+    name: 'vpp-csit-verify-virl-{stream}'
 
     project-type: freestyle
     node: 'verify-{os}'
@@ -227,7 +250,7 @@
             output-path: 'csit'
 
 - job-template:
-    name: 'vpp-csit-verify-hw-perf-{type}'
+    name: 'vpp-csit-verify-hw-perf-{stream}-{type}'
 
     project-type: freestyle
     node: 'verify-{os}'