Merge "[VOL-3160] clean up oltDebian parameter on the jobs/templates"
diff --git a/jjb/pipeline/voltha-physical-build-and-tests.groovy b/jjb/pipeline/voltha-physical-build-and-tests.groovy
index 46c845d..0ea5c3b 100644
--- a/jjb/pipeline/voltha-physical-build-and-tests.groovy
+++ b/jjb/pipeline/voltha-physical-build-and-tests.groovy
@@ -148,7 +148,7 @@
echo "on master, using default settings for kind-voltha"
fi
- if ! [[ "${gerritProject}" =~ ^(voltha-system-tests|kind-voltha)\$ ]]; then
+ if ! [[ "${gerritProject}" =~ ^(voltha-system-tests|kind-voltha|voltha-helm-charts)\$ ]]; then
make -C $WORKSPACE/voltha/${gerritProject} DOCKER_REPOSITORY=voltha/ DOCKER_TAG=citest docker-build
docker images | grep citest
for image in \$(docker images -f "reference=*/*citest" --format "{{.Repository}}")
@@ -203,6 +203,16 @@
EXTRA_HELM_FLAGS+="--set images.\$I.tag=citest,images.\$I.pullPolicy=Never "
done
+ if [ "${gerritProject}" = "voltha-helm-charts" ]; then
+ export CHART_PATH=$WORKSPACE/voltha/voltha-helm-charts
+ export VOLTHA_CHART=\$CHART_PATH/voltha
+ export VOLTHA_ADAPTER_OPEN_OLT_CHART=\$CHART_PATH/voltha-adapter-openolt
+ export VOLTHA_ADAPTER_OPEN_ONU_CHART=\$CHART_PATH/voltha-adapter-openonu
+ helm dep update \$VOLTHA_CHART
+ helm dep update \$VOLTHA_ADAPTER_OPEN_OLT_CHART
+ helm dep update \$VOLTHA_ADAPTER_OPEN_ONU_CHART
+ fi
+
cd $WORKSPACE/voltha/kind-voltha/
echo \$EXTRA_HELM_FLAGS
kail -n voltha -n default > $WORKSPACE/onos-voltha-combined.log &
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index b1e04b3..76e56b9 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -602,7 +602,7 @@
comment-contains-value: '^hardware test with delay$'
projects:
- project-compare-type: REG_EXP
- project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|voltha-api-server|voltha-system-tests|ofagent-py|ofagent-go|voltha-onos|kind-voltha)$'
+ project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|voltha-api-server|voltha-system-tests|ofagent-py|ofagent-go|voltha-onos|kind-voltha|voltha-helm-charts)$'
branches:
- branch-compare-type: REG_EXP
branch-pattern: '{all-branches-regexp}'
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 9ecce0e..636717b 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -208,22 +208,44 @@
extraHelmFlags: '--set memoryLimit=8192Mi --set auth=false '
onosImg: andreacampanella/voltha-onos:meter-queue-final-3
- # - 'voltha-scale-measurements':
- # disabled: true
- # name: 'voltha-scale-measurements-2-16-32-att-subscribers'
- # build-node: 'onf-pod1-head-node'
- # time-trigger: "H H/4 * * *"
- # olts: 2
- # pons: 16
- # onus: 32
- # withFlows: true
- # provisionSubscribers: true
- # withEapol: true
- # withDhcp: true
- # withIgmp: false
- # openonuAdapterReplicas: 8
- # onosReplicas: 3
- # atomixReplicas: 3
+ - 'voltha-scale-measurements':
+ disabled: true
+ name: 'voltha-scale-measurements-2-16-32-att-subscribers'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/4 * * *"
+ olts: 2
+ pons: 16
+ onus: 32
+ withFlows: true
+ provisionSubscribers: true
+ withEapol: true
+ withDhcp: true
+ withIgmp: false
+ openonuAdapterReplicas: 8
+ onosReplicas: 3
+ atomixReplicas: 3
+ extraHelmFlags: '--set memoryLimit=8192Mi '
+ onosImg: andreacampanella/voltha-onos:meter-queue-final-3
+
+ # jobs for DT with 512 ONUs with a 8 openonu-adapters and clustered ONOS.
+ - 'voltha-scale-measurements':
+ name: 'voltha-scale-measurements-2-16-32-dt-subscribers'
+ build-node: 'onf-pod1-head-node'
+ time-trigger: "H H/4 * * *"
+ olts: 2
+ pons: 16
+ onus: 32
+ withFlows: true
+ provisionSubscribers: true
+ workflow: dt
+ withEapol: false
+ withDhcp: false
+ withIgmp: false
+ openonuAdapterReplicas: 8
+ onosReplicas: 3
+ atomixReplicas: 3
+ extraHelmFlags: '--set memoryLimit=8192Mi '
+ onosImg: andreacampanella/voltha-onos:meter-queue-final-3
# development pipeline
- 'voltha-scale-measurements-dev':