VPP: csit ref pointer for dual commit testing

Change-Id: Ib9ac1042f463689d8910bb9bb78cea82f1ba7da3
Signed-off-by: Ed Kern <[email protected]>

diff --git a/jjb/vpp/include-raw-vpp-csit-functional.sh b/jjb/vpp/include-raw-vpp-csit-functional.sh
index 38863fd..988b14a 100644 (file)
--- a/jjb/vpp/include-raw-vpp-csit-functional.sh
+++ b/jjb/vpp/include-raw-vpp-csit-functional.sh
@@ -30,42 +30,50 @@ else
     cp /var/cache/apt/archives/vpp-dpdk-dkms*.deb csit/
 fi
 
-cd csit
-
-if [ "$CSIT_BRANCH" == "latest" ]; then
-    # set required CSIT branch_id based on VPP master branch; by default use 'oper'
-    case "$VPP_BRANCH" in
-        master )
-            BRANCH_ID="oper"
-            ;;
-        stable/1710 )
-            BRANCH_ID="oper-rls1710"
-            ;;
-        stable/1801 )
-            BRANCH_ID="oper-rls1801"
-            ;;
-        * )
-            BRANCH_ID="oper"
-    esac
+# Check for CSIT_REF test file
+if [ -e CSIT_REF ]; then
+    source CSIT_REF
+fi
 
-    # get the latest verified version of the required branch
-    CSIT_BRANCH=$(echo $(git branch -r | grep -E "${BRANCH_ID}-[0-9]+" | tail -n 1))
+# If also testing a specific csit refpoint look for CSIT_REF
+if [[ -v CSIT_REF ]]; then
+    (cd csit ; git fetch ssh://[email protected]:29418/csit $CSIT_REF && git checkout FETCH_HEAD)
+else
+    cd csit
+    if [ "$CSIT_BRANCH" == "latest" ]; then
+        # set required CSIT branch_id based on VPP master branch; by default use 'oper'
+        case "$VPP_BRANCH" in
+            master )
+                BRANCH_ID="oper"
+                ;;
+            stable/1710 )
+                BRANCH_ID="oper-rls1710"
+                ;;
+            stable/1801 )
+                BRANCH_ID="oper-rls1801"
+                ;;
+            * )
+                BRANCH_ID="oper"
+        esac
 
-    if [ "${CSIT_BRANCH}" == "" ]; then
-        echo "No verified CSIT branch found - exiting"
-        exit 1
-    fi
+        # get the latest verified version of the required branch
+        CSIT_BRANCH=$(echo $(git branch -r | grep -E "${BRANCH_ID}-[0-9]+" | tail -n 1))
 
-    # remove 'origin/' from the branch name
-    CSIT_BRANCH=$(echo ${CSIT_BRANCH#origin/})
-fi
+        if [ "${CSIT_BRANCH}" == "" ]; then
+            echo "No verified CSIT branch found - exiting"
+            exit 1
+        fi
 
-# checkout the required csit branch
-git checkout ${CSIT_BRANCH}
+        # remove 'origin/' from the branch name
+        CSIT_BRANCH=$(echo ${CSIT_BRANCH#origin/})
+    fi
+    # checkout the required csit branch
+    git checkout ${CSIT_BRANCH}
 
-if [ $? != 0 ]; then
-    echo "Failed to checkout the required CSIT branch: ${CSIT_BRANCH}"
-    exit 1
+    if [ $? != 0 ]; then
+        echo "Failed to checkout the required CSIT branch: ${CSIT_BRANCH}"
+        exit 1
+    fi
 fi
 
 # execute csit bootstrap script if it exists

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index b8b45fc..3aa58b9 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -221,6 +221,9 @@
             repo-name: '{repo-stream-part}.ubuntu.xenial.main'
         - is-csit-vpp-job-parameter:
             is-csit-vpp-job: 'True'
+        - string:
+            name: CSIT_REF
+            description: "Also testing CSIT_REF"
 
     scm:
         - gerrit-trigger-scm: