[VOL-5010] - Clone unit tests to run on a v2.12 branch
jjb/voltha-test/voltha.yaml
---------------------------
o Clone 2.11 tests into 2.12
vars/installVoltctl.groovy
--------------------------
o Version update pending on tool deployment.
jjb/pipeline/voltha/makefile
jjb/pipeline/voltha/master/bbsim-tests.groovy
jjb/pipeline/voltha/voltha-2.11/bbsim-tests.groovy
jjb/pipeline/voltha/voltha-2.11/physical-build.groovy
jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
jjb/pipeline/voltha/voltha-2.12/physical-build.groovy
-----------------------------------------------------
o Clone master test scripts onto a release branch.
o Update to remove branch=master dependencies.
jjb/repos/voltha-helm-charts.yaml
---------------------------------
o Add pipeline job set voltha-2.12
o Remove jobset voltha-2.8
jjb/software-upgrades.yaml
--------------------------
o Clone v2.11 defintions into v2.12
o Rename *-new and *-old into *-master and *-2.8
o Comment out 2.8 pipeline entries.
jjb/verify/bbsim-sadis-server.yaml
jjb/verify/bbsim.yaml
jjb/verify/ofagent-go.yaml
jjb/verify/voltha-api-server.yaml
jjb/verify/voltha-go.yaml
jjb/verify/voltha-onos.yaml
jjb/verify/voltha-openolt-adapter.yaml
jjb/verify/voltha-openolt-adapter-go.yaml
jjb/verify/voltha-system-tests.yaml
jjb/voltha-e2e.yaml
jjb/voltha-scale.yaml
jjb/voltha-test/voltha-certification.yaml
jjb/voltha-test/voltha.yaml
-----------------------------------------
o Add job definitions for v2.12
o Del job definitions for v2.8
Revisit version strings post publishing:
o [VOL-5082] revisit the deploy base tag versions
o [VOL-5083] jjb/voltha-scale.yaml
Change-Id: I3bbe01bbbcb068fc63ca1fd6d07d7da3d25d007c
diff --git a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
index d3950ea..ce04a78 100644
--- a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
@@ -38,7 +38,7 @@
'jjb',
'pipeline',
'voltha',
- 'master',
+ 'voltha-2.12',
'bbsim-tests.groovy'
].join('/')
println("** ${iam}: ENTER")
@@ -46,7 +46,7 @@
String cmd = "which pkill"
def stream = sh(
returnStatus:false,
- returnStdout: true,
+ returnStdout:true,
script: cmd)
println(" ** ${cmd}:\n${stream}")
@@ -107,7 +107,10 @@
// if we're downloading a voltha-helm-charts patch, then install from a local copy of the charts
def localCharts = false
- if (volthaHelmChartsChange != "" || gerritProject == "voltha-helm-charts") {
+ if (volthaHelmChartsChange != ""
+ || gerritProject == "voltha-helm-charts"
+ || branch != 'master'
+ ) {
localCharts = true
}
@@ -202,7 +205,7 @@
ROBOT_MISC_ARGS+="-v ONOS_SSH_PORT:30115 -v ONOS_REST_PORT:30120 -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace} -v container_log_dir:${logsDir} -v logging:${testLogging}"
export KVSTOREPREFIX=voltha/voltha_voltha
- make -C "$WORKSPACE/voltha-system-tests" ${testTarget} || true
+ make -C "$WORKSPACE/voltha-system-tests" ${testTarget}
"""
getPodsInfo("${logsDir}")
@@ -218,9 +221,9 @@
sh """
if [ ${withMonitoring} = true ] ; then
cd "$WORKSPACE/voltha-system-tests"
- source ./vst_venv/bin/activate || true
+ source ./vst_venv/bin/activate
# Collect memory consumption of voltha pods once all the tests are complete
- python scripts/mem_consumption.py -o $WORKSPACE/voltha-pods-mem-consumption-${workflow} -a 0.0.0.0:31301 -n ${volthaNamespace} || true
+ python scripts/mem_consumption.py -o $WORKSPACE/voltha-pods-mem-consumption-${workflow} -a 0.0.0.0:31301 -n ${volthaNamespace}
fi
"""
} // stage