Work towards QA-Pod nightly trigger
- Fix typo for latest_branches
- Add station to postjobs
- Don't checkout onos code for QA-POD
Change-Id: I48a8fb6d0ff2f8bead541c7a16d2c248917ccc5f
diff --git a/TestON/JenkinsFile/MasterTrigger.groovy b/TestON/JenkinsFile/MasterTrigger.groovy
index 1622a95..1977fcc 100644
--- a/TestON/JenkinsFile/MasterTrigger.groovy
+++ b/TestON/JenkinsFile/MasterTrigger.groovy
@@ -258,6 +258,21 @@
git branch
git log -1 --decorate
'''
+ } else if ( category == "SR-Tofino" ){
+ result = '''echo -e "\n##### Set TestON Branch #####"
+ echo "TestON Branch is set on: ''' + test_branch + '''"
+ cd ~/OnosSystemTest/
+ git checkout HEAD~1 # Make sure you aren't pn a branch
+ git branch | grep -v "detached from" | xargs git branch -d # delete all local branches merged with remote
+ git branch -D ''' + test_branch + ''' # just in case there are local changes. This will normally result in a branch not found error
+ git clean -df # clean any local files
+ git fetch --all # update all caches from remotes
+ git reset --hard origin/''' + test_branch + ''' # force local index to match remote branch
+ git clean -df # clean any local files
+ git checkout ''' + test_branch + ''' #create new local branch
+ git branch
+ git log -1 --decorate
+ '''
} else {
result = '''echo -e "\n##### Set TestON Branch #####"
echo "TestON Branch is set on: ''' + test_branch + '''"
diff --git a/TestON/JenkinsFile/dependencies/branches.json b/TestON/JenkinsFile/dependencies/branches.json
index 39269c2..cf4682c 100644
--- a/TestON/JenkinsFile/dependencies/branches.json
+++ b/TestON/JenkinsFile/dependencies/branches.json
@@ -1,6 +1,6 @@
{
"latest_branches": {
- "onos-LTS1": "2.5,
+ "onos-LTS1": "2.5",
"onos-LTS2": "2.2"
},
"support_branches": {
diff --git a/TestON/JenkinsFile/dependencies/paths.json b/TestON/JenkinsFile/dependencies/paths.json
index 567d484..6568bad 100644
--- a/TestON/JenkinsFile/dependencies/paths.json
+++ b/TestON/JenkinsFile/dependencies/paths.json
@@ -8,6 +8,7 @@
"Fabric" : "/var/jenkins/workspace/postjob-Fabric/",
"Fabric5" : "/var/jenkins/workspace/postjob-Fabric5/",
"Trellis" : "/var/jenkins/workspace/postjob-Trellis-POD/"
+ "QA-POD" : "/var/jenkins/workspace/postjob-QA-POD/"
},
"rScript": {
"directories": {