Added withMonitoring to voltha-patch-test job template
Change-Id: I1147172c6b6ab986295f787aeb73581d7ebe103d
diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index 017010e..edfcb6c 100755
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -115,7 +115,9 @@
JENKINS_NODE_COOKIE="dontKillMe" _TAG="bbsim\${i}" bash -c "while true; do kubectl port-forward --address 0.0.0.0 -n ${volthaNamespace} svc/bbsim\${i} \${bbsimDmiPortFwd}:50075; done"&
((bbsimDmiPortFwd++))
done
- JENKINS_NODE_COOKIE="dontKillMe" _TAG="nem-monitoring-prometheus-server" bash -c "while true; do kubectl port-forward --address 0.0.0.0 -n default svc/nem-monitoring-prometheus-server 31301:80; done"&
+ if [ ${withMonitoring} = true ] ; then
+ JENKINS_NODE_COOKIE="dontKillMe" _TAG="nem-monitoring-prometheus-server" bash -c "while true; do kubectl port-forward --address 0.0.0.0 -n default svc/nem-monitoring-prometheus-server 31301:80; done"&
+ fi
ps aux | grep port-forward
"""
// setting ONOS log level
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 08a2f97..1f1eb3c 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -1577,6 +1577,7 @@
volthaHelmChartsChange: ''
extraHelmFlags: ''
enableMacLearning: false
+ withMonitoring: false
robot-args: ''
branch-regexp: '{all-branches-regexp}'
testTargets: |
@@ -1688,6 +1689,11 @@
default: '{registry}'
description: 'Which registry to use (amazon vs menlo)'
+ - bool:
+ name: withMonitoring
+ default: '{withMonitoring}'
+ description: 'Option to install Prometheus'
+
- string:
name: logLevel
default: '{logLevel}'