[VOL-3584] Creating keywords for scale test
- "voltha scale test ATT"
- "voltha scale test TT"
- "voltha scale test DT"
- "test voltha scale" runs the job on the dev pod
Change-Id: Iae36e1427e080996ce4a820b0f65357e3911760d
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index a8eaaf6..74b7c5f 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -154,6 +154,23 @@
}
}
}
+ stage('Build patch') {
+ when {
+ expression {
+ return env.hasProperty("GERRIT_PROJECT")
+ }
+ }
+ steps {
+ sh """
+ git clone https://$GERRIT_HOST/$GERRIT_PROJECT
+ cd $GERRIT_PROJECT
+ git fetch https://$GERRIT_HOST/$GERRIT_PROJECT $GERRIT_REFSPEC && git checkout FETCH_HEAD
+
+ DOCKER_REGISTRY=${dockerRegistry}/ DOCKER_REPOSITORY=voltha/ DOCKER_TAG=voltha-scale make docker-build
+ DOCKER_REGISTRY=${dockerRegistry}/ DOCKER_REPOSITORY=voltha/ DOCKER_TAG=voltha-scale make docker-push
+ """
+ }
+ }
stage('Deploy common infrastructure') {
// includes monitoring, kafka, etcd
steps {
@@ -193,33 +210,34 @@
fi
# BBSim custom image handling
- if [ '${bbsimImg.trim()}' != '' ]; then
+ if [ '${bbsimImg.trim()}' != '' ] && [ '$GERRIT_PROJECT' != 'bbsim' ]; then
IFS=: read -r bbsimRepo bbsimTag <<< '${bbsimImg.trim()}'
EXTRA_HELM_FLAGS+="--set images.bbsim.repository=\$bbsimRepo,images.bbsim.tag=\$bbsimTag "
fi
# VOLTHA and ofAgent custom image handling
# NOTE to override the rw-core image in a released version you must set the ofAgent image too
- if [ '${rwCoreImg.trim()}' != '' ] && [ '${ofAgentImg.trim()}' != '' ]; then
+ # TODO split ofAgent and voltha-go
+ if [ '${rwCoreImg.trim()}' != '' ] && [ '${ofAgentImg.trim()}' != '' ] && [ '$GERRIT_PROJECT' != 'voltha-go' ]; then
IFS=: read -r rwCoreRepo rwCoreTag <<< '${rwCoreImg.trim()}'
IFS=: read -r ofAgentRepo ofAgentTag <<< '${ofAgentImg.trim()}'
EXTRA_HELM_FLAGS+="--set images.rw_core.repository=\$rwCoreRepo,images.rw_core.tag=\$rwCoreTag,images.ofagent.repository=\$ofAgentRepo,images.ofagent.tag=\$ofAgentTag "
fi
# OpenOLT custom image handling
- if [ '${openoltAdapterImg.trim()}' != '' ]; then
+ if [ '${openoltAdapterImg.trim()}' != '' ] && [ '$GERRIT_PROJECT' != 'voltha-openolt-adapter' ]; then
IFS=: read -r openoltAdapterRepo openoltAdapterTag <<< '${openoltAdapterImg.trim()}'
EXTRA_HELM_FLAGS+="--set images.adapter_open_olt.repository=\$openoltAdapterRepo,images.adapter_open_olt.tag=\$openoltAdapterTag "
fi
# OpenONU custom image handling
- if [ '${openonuAdapterImg.trim()}' != '' ]; then
+ if [ '${openonuAdapterImg.trim()}' != '' ] && [ '$GERRIT_PROJECT' != 'voltha-openonu-adapter' ]; then
IFS=: read -r openonuAdapterRepo openonuAdapterTag <<< '${openonuAdapterImg.trim()}'
EXTRA_HELM_FLAGS+="--set images.adapter_open_onu.repository=\$openonuAdapterRepo,images.adapter_open_onu.tag=\$openonuAdapterTag "
fi
# ONOS custom image handling
- if [ '${onosImg.trim()}' != '' ]; then
+ if [ '${onosImg.trim()}' != '' ] && [ '$GERRIT_PROJECT' != 'voltha-onos' ]; then
IFS=: read -r onosRepo onosTag <<< '${onosImg.trim()}'
EXTRA_HELM_FLAGS+="--set images.onos.repository=\$onosRepo,images.onos.tag=\$onosTag "
fi
@@ -241,6 +259,32 @@
export BBSIM_CFG="$WORKSPACE/kind-voltha/configs/bbsim-sadis-${workflow}.yaml"
fi
+ # Use custom built images
+
+ if [ '$GERRIT_PROJECT' == 'voltha-go' ]; then
+ EXTRA_HELM_FLAGS+="--set images.rw_core.repository=${dockerRegistry}/voltha/voltha-rw-core,images.rw_core.tag=voltha-scale "
+ fi
+
+ if [ '$GERRIT_PROJECT' == 'voltha-openolt-adapter' ]; then
+ EXTRA_HELM_FLAGS+="--set images.adapter_open_olt.repository=${dockerRegistry}/voltha/voltha-openolt-adapter,images.adapter_open_olt.tag=voltha-scale "
+ fi
+
+ if [ '$GERRIT_PROJECT' == 'voltha-openonu-adapter' ]; then
+ EXTRA_HELM_FLAGS+="--set images.adapter_open_onu.repository=${dockerRegistry}/voltha/voltha-openonu-adapter,images.adapter_open_onu.tag=voltha-scale "
+ fi
+
+ if [ '$GERRIT_PROJECT' == 'ofagent-go' ]; then
+ EXTRA_HELM_FLAGS+="--set images.ofagent.repository=${dockerRegistry}/voltha/voltha-ofagent-go,images.ofagent.tag=voltha-scale "
+ fi
+
+ if [ '$GERRIT_PROJECT' == 'voltha-onos' ]; then
+ EXTRA_HELM_FLAGS+="--set images.onos.repository=${dockerRegistry}/voltha/voltha-onos,images.onos.tag=voltha-scale "
+ fi
+
+ if [ '$GERRIT_PROJECT' == 'bbsim' ]; then
+ EXTRA_HELM_FLAGS+="--set images.bbsim.repository=${dockerRegistry}/voltha/bbsim,images.bbsim.tag=voltha-scale "
+ fi
+
./voltha up
# Forward the ETCD port onto $VOLTHA_ETCD_PORT
@@ -274,6 +318,7 @@
sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 cfg set org.onosproject.net.flow.impl.FlowRuleManager allowExtraneousRules true
sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 cfg set org.onosproject.net.flow.impl.FlowRuleManager importExtraneousRules true
+
sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 cfg set org.onosproject.net.flowobjective.impl.InOrderFlowObjectiveManager accumulatorMaxBatchMillis 1000
sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 cfg set org.onosproject.net.flowobjective.impl.InOrderFlowObjectiveManager accumulatorMaxIdleMillis 500