Fix the user name for CHO-1.12 and the node
Change-Id: I349cf63bdde763e40f031a873cb2788107c0ca5e
diff --git a/jjb/OnosSystemTest/cho-post-sdn.sh b/jjb/OnosSystemTest/cho-post-sdn.sh
new file mode 100644
index 0000000..150eb19
--- /dev/null
+++ b/jjb/OnosSystemTest/cho-post-sdn.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+export PYTHONPATH=/home/sdn/TestON:/home/sdn/sts
+
+#Run LogReport
+#/var/lib/jenkins/LogReport.py --nodes '10.128.40.41' '10.128.40.42' '10.128.40.43' --terms 'WARN' 'ERROR' 'Except' > /tmp/LogReport.txt
+
+#Copy generated wiki report file from TestON .rpt to /tmp
+#/var/lib/jenkins/Jenkins_getresult.py > /tmp/CHOresults.txt
+
+cd ~/CHO_Jenkins_Scripts
+# Generate the cvs files for plotting
+bash log-summary
+#source log-summary-cumulative 500
+
+# Refrest the images generated by Monitorix
+#curl http://10.128.40.41:8080/monitorix-cgi/monitorix.cgi?mode=localhost\&graph=all\&when=1week\&color=black > /dev/null
+#curl http://10.128.40.42:8080/monitorix-cgi/monitorix.cgi?mode=localhost\&graph=all\&when=1week\&color=black > /dev/null
+#curl http://10.128.40.43:8080/monitorix-cgi/monitorix.cgi?mode=localhost\&graph=all\&when=1week\&color=black > /dev/null
+#curl http://10.128.40.50:8080/monitorix-cgi/monitorix.cgi?mode=localhost\&graph=all\&when=1week\&color=black > /dev/null
+
+# Download required images to workspace folder
+#curl -o onos1cpu.png http://10.128.40.41:8080/monitorix/imgs/system1z.1week.png
+#curl -o onos1mem.png http://10.128.40.41:8080/monitorix/imgs/system3z.1week.png
+#curl -o onos1net.png http://10.128.40.41:8080/monitorix/imgs/net01z.1week.png
+#curl -o mininetcpu.png http://10.128.40.50:8080/monitorix/imgs/system1z.1week.png
+#curl -o mininetnet.png http://10.128.40.50:8080/monitorix/imgs/net01z.1week.png
diff --git a/jjb/OnosSystemTest/onos-test-freestyle.yaml b/jjb/OnosSystemTest/onos-test-freestyle.yaml
index 6ee6841..305adf4 100644
--- a/jjb/OnosSystemTest/onos-test-freestyle.yaml
+++ b/jjb/OnosSystemTest/onos-test-freestyle.yaml
@@ -481,7 +481,7 @@
properties-file: '/var{dir}/jenkins/TestONOS.property'
builders:
- - shell: !include-raw-escape: cho-post.sh
+ - shell: !include-raw-escape: cho-post{file}.sh
publishers:
- plot:
- title: 'Network, Application and ONOS Events (per hour)'
@@ -669,14 +669,17 @@
branch: 'master'
node: 'CHO'
dir: '/lib'
+ file: ''
- 'post-CHO':
branch: '1.13'
node: 'CHO'
dir: '/lib'
+ file: ''
- 'post-CHO':
branch: '1.12'
- node: 'Fabric4'
+ node: 'Fabric5'
dir: ''
+ file: '-sdn'
- project:
name: log-pipeline