CIMANAGE-11: Change of CSIT branch names

- change csit-verified-master-YYYY-MM-DD to
  oper-YYMMDD
- change csit-verified-stable1606-YYYY-MM-DD to
  oper-rls1606-YYMMDD

Change-Id: Idcf889e1703d54ff33855ceb528ced54035e036d
Signed-off-by: Jan Gelety <jgelety@cisco.com>

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 110f247..83daf04 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -10,7 +10,7 @@
 
     project: 'csit'
     branch: 'master'
-    branch-id: 'master'
+    branch-id: 'oper'
     build-artifact-num-to-keep: 10
     type:
         - all
@@ -18,10 +18,10 @@
     stream:
         - master:
             branch: 'master'
-            branch-id: 'master'
+            branch-id: 'oper'
         - '1606':
-            branch: 'stable/1606'
-            branch-id: 'stable1606'
+            branch: 'rls1606'
+            branch-id: 'oper-rls1606'
 
 - job-template:
     name: 'csit-vpp-functional-{stream}-virl'
@@ -311,7 +311,7 @@
                branches:
                 - branch:
                     remote: origin
-                    name: 'refs/heads/csit-verified-{branch-id}-$DATE'
+                    name: 'refs/heads/{branch-id}-$DATE'
 
 
 - job-template:

diff --git a/jjb/csit/include-raw-csit-vpp-verify-semiweekly.sh b/jjb/csit/include-raw-csit-vpp-verify-semiweekly.sh
index 13df074..cd17854 100644 (file)
--- a/jjb/csit/include-raw-csit-vpp-verify-semiweekly.sh
+++ b/jjb/csit/include-raw-csit-vpp-verify-semiweekly.sh
@@ -19,7 +19,7 @@ fi
 cd csit
 
 # get the latest verified version of the required branch
-BRANCH_NAME=$(echo $(git branch -r | grep csit-verified-${BRANCH_ID} | tail -n 1))
+BRANCH_NAME=$(echo $(git branch -r | grep ${BRANCH_ID} | tail -n 1))
 
 if [ "${BRANCH_NAME}" == "" ]; then
     echo "No verified version found for requested branch - exiting"