Merge "Fix TREX linting"

[ci-management.git] / jjb / vpp / include-raw-vpp-csit-functional.sh

diff --git a/jjb/vpp/include-raw-vpp-csit-functional.sh b/jjb/vpp/include-raw-vpp-csit-functional.sh
index 38863fd..804ed62 100644 (file)
--- a/jjb/vpp/include-raw-vpp-csit-functional.sh
+++ b/jjb/vpp/include-raw-vpp-csit-functional.sh
@@ -27,45 +27,62 @@ if [ -e dpdk/vpp-dpdk-dkms*.deb ]
 then
     cp dpdk/vpp-dpdk-dkms*.deb csit/
 else
-    cp /var/cache/apt/archives/vpp-dpdk-dkms*.deb csit/
+    cp /w/dpdk/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://rotterdam-jobbuilder@gerrit.fd.io: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"
+                ;;
+            stable/1804 )
+                BRANCH_ID="oper-rls1804"
+                ;;
+            stable/1807 )
+                BRANCH_ID="oper-rls1807"
+                ;;
+            stable/1810 )
+                BRANCH_ID="oper-rls1810"
+                ;;
+            * )
+                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