Change the NSH SFC test trigger.

Change-Id: I9ce275975c17964f9b324d63a824b6bec44679b2
Signed-off-by: Fangyin Hu <fangyinx.hu@intel.com>

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 47cea86..9cd91c2 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -3788,6 +3788,10 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - os-parameter:
+            os: 'ubuntu1604'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -3803,7 +3807,7 @@
         - gerrit-trigger-manually-triggered:
             name: '{project}'
             branch: '{branch}'
-            comment-trigger-value: 'csit_nsh_sfc_perf'
+            comment-trigger-value: 'csit_nsh_sfc_perf_{stream}'
 
     builders:
         - shell:
@@ -3840,6 +3844,8 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -3855,7 +3861,7 @@
         - gerrit-trigger-manually-triggered:
             name: '{project}'
             branch: '{branch}'
-            comment-trigger-value: 'csit_nsh_sfc_func'
+            comment-trigger-value: 'csit_nsh_sfc_func_{stream}'
 
     builders:
         - shell:

diff --git a/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh b/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh
index 3e88579..2f22a98 100644 (file)
--- a/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh
+++ b/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh
@@ -7,7 +7,11 @@ then
     # make sure that bootstrap-nsh_sfc-functional-virl.sh is executable
     chmod +x bootstrap-nsh_sfc-functional-virl.sh
     # run the script
-    ./bootstrap-nsh_sfc-functional-virl.sh
+    if [ ${STREAM} == 'master' ]; then
+        ./bootstrap-nsh_sfc-functional-virl.sh ${STREAM} ${OS}
+    else
+        ./bootstrap-nsh_sfc-functional-virl.sh 'stable.'${STREAM} ${OS}
+    fi
 else
     echo 'ERROR: No bootstrap-nsh_sfc-functional-virl.sh found'
     exit 1

diff --git a/jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh b/jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh
index e790204..7624889 100644 (file)
--- a/jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh
+++ b/jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh
@@ -10,6 +10,10 @@ fi
 # make sure that bootstrap-verify-perf.sh is executable
 chmod +x bootstrap-verify-perf-nsh_sfc.sh
 # run the script
-./bootstrap-verify-perf-nsh_sfc.sh
+if [ ${STREAM} == 'master' ]; then
+    ./bootstrap-verify-perf-nsh_sfc.sh ${STREAM} ${OS}
+else
+    ./bootstrap-verify-perf-nsh_sfc.sh 'stable.'${STREAM} ${OS}
+fi
 
 # vim: ts=4 ts=4 sts=4 et :