Merge "[VOL-3385] Adding GPON jobs to ONF demo pod"
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 3be724d..a359e90 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -789,7 +789,7 @@
- string:
name: spgwcImage
- default: 'omecproject/ngic-cp:central-cp-multi-upfs-latest'
+ default: 'omecproject/spgw:master-latest'
description: 'Docker image for spgwc. Leave empty to use default helm-charts value'
- string:
diff --git a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
index 180bf00..43abe03 100644
--- a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
@@ -23,7 +23,7 @@
label "${params.buildNode}"
}
options {
- timeout(time: 180, unit: 'MINUTES')
+ timeout(time: 240, unit: 'MINUTES')
}
environment {
diff --git a/jjb/pipeline/voltha-openonu-go-tests.groovy b/jjb/pipeline/voltha-openonu-go-tests.groovy
index 1949a5b..a413f36 100644
--- a/jjb/pipeline/voltha-openonu-go-tests.groovy
+++ b/jjb/pipeline/voltha-openonu-go-tests.groovy
@@ -133,9 +133,13 @@
sh '''
mkdir -p $ROBOT_LOGS_DIR
export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR"
- export TARGET=openonu-go-adapter-test
+ export TARGET_DEFAULT=openonu-go-adapter-test
- make -C $WORKSPACE/voltha/voltha-system-tests \$TARGET || true
+ make -C $WORKSPACE/voltha/voltha-system-tests \$TARGET_DEFAULT || true
+
+ export TARGET_1T8GEM=1t8gem-openonu-go-adapter-test
+
+ make -C $WORKSPACE/voltha/voltha-system-tests \$TARGET_1T8GEM || true
'''
}
}
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index a5dd815..0cf443c 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -178,6 +178,7 @@
# Load the release defaults
if [ '${release.trim()}' != 'master' ]; then
source $WORKSPACE/kind-voltha/releases/${release}
+ EXTRA_HELM_FLAGS+=" ${extraHelmFlags} "
fi
# BBSim custom image handling
@@ -221,6 +222,9 @@
# No persistent-volume-claims in Atomix
EXTRA_HELM_FLAGS+="--set atomix.persistence.enabled=false "
+ echo "Installing with the following extra arguments:"
+ echo $EXTRA_HELM_FLAGS
+
./voltha up
# Forward the ETCD port onto $VOLTHA_ETCD_PORT
@@ -440,7 +444,7 @@
kubectl get pods --all-namespaces -o jsonpath="{range .items[*].status.containerStatuses[*]}{.imageID}{'\\n'}" | sort | uniq | tee $LOG_FOLDER/pod-imagesId.txt || true
# log in individual files for all the container that match the selector app=$APP_TO_LOG
- APPS_TO_LOG=(etcd kafka onos adapter-open-onu adapter-open-olt rw-core ofagent bbsim)
+ APPS_TO_LOG=(etcd kafka onos adapter-open-onu adapter-open-olt rw-core ofagent bbsim radius)
for app in "${APPS_TO_LOG[@]}"
do
echo "Getting logs for: ${app}"
@@ -481,6 +485,7 @@
if [ ${withEapol} = true ] ; then
sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 aaa-users > $WORKSPACE/logs/onos-aaa-users.txt || true
+ sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 aaa-statistics > $WORKSPACE/logs/onos-aaa-statistics.txt || true
fi
if [ ${withDhcp} = true ] ; then
diff --git a/jjb/verify/pyvoltha.yaml b/jjb/verify/pyvoltha.yaml
index b8564cb..70cfc52 100644
--- a/jjb/verify/pyvoltha.yaml
+++ b/jjb/verify/pyvoltha.yaml
@@ -11,17 +11,6 @@
- 'publish-pyvoltha-jobs':
branch-regexp: '{all-branches-regexp}'
pypi-index: 'pypi'
- - 'voltha-periodic-test':
- name: 'nightly-pyvoltha-compatibility-test'
- pipeline-script: 'voltha-bbsim-tests.groovy'
- build-node: 'ubuntu16.04-basebuild-4c-8g'
- default-image-tag: 'master'
- code-branch: 'master'
- make-target: sanity-single-kind
- gerrit-project: pyvoltha
- onus: 1
- pons: 1
- time-trigger: "@daily"
- job-group:
name: 'verify-pyvoltha-jobs'
diff --git a/jjb/verify/voltha-lib-go.yaml b/jjb/verify/voltha-lib-go.yaml
index 9f148ef..51d0405 100644
--- a/jjb/verify/voltha-lib-go.yaml
+++ b/jjb/verify/voltha-lib-go.yaml
@@ -8,17 +8,6 @@
jobs:
- 'verify-voltha-lib-go-jobs':
branch-regexp: '{all-branches-regexp}'
- - 'voltha-periodic-test':
- name: 'nightly-voltha-lib-go-compatibility-test'
- pipeline-script: 'voltha-bbsim-tests.groovy'
- build-node: 'ubuntu16.04-basebuild-4c-8g'
- default-image-tag: 'master'
- code-branch: 'master'
- make-target: sanity-single-kind
- gerrit-project: voltha-lib-go
- onus: 1
- pons: 1
- time-trigger: "@daily"
- job-group:
name: 'verify-voltha-lib-go-jobs'
diff --git a/jjb/verify/voltha-protos.yaml b/jjb/verify/voltha-protos.yaml
index 98afdb0..aefda8b 100644
--- a/jjb/verify/voltha-protos.yaml
+++ b/jjb/verify/voltha-protos.yaml
@@ -12,17 +12,6 @@
branch-regexp: '{all-branches-regexp}'
pypi-index: 'pypi'
pypi-prep-commands: 'make python-protos'
- - 'voltha-periodic-test':
- name: 'nightly-voltha-protos-compatibility-test'
- pipeline-script: 'voltha-bbsim-tests.groovy'
- build-node: 'ubuntu16.04-basebuild-4c-8g'
- default-image-tag: 'master'
- code-branch: 'master'
- make-target: sanity-single-kind
- gerrit-project: voltha-protos
- onus: 1
- pons: 1
- time-trigger: "@daily"
- job-group:
name: 'verify-voltha-protos-jobs'
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 4655837..6ee6590 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -244,11 +244,11 @@
karafHome: apache-karaf-4.2.8
logLevel: INFO
bbsimImg: ''
- rwCoreImg: ''
+ rwCoreImg: 'matteoscandolo/voltha-rw-core:voltha-2.4-dev'
ofAgentImg: ''
openoltAdapterImg: matteoscandolo/voltha-openolt-adapter:per-gem-lock
openonuAdapterImg: ''
- onosImg: ''
+ onosImg: andreacampanella/voltha-onos:eapol-retry
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-voltha-2.4-2-16-32-dt-subscribers'
@@ -271,11 +271,11 @@
karafHome: apache-karaf-4.2.8
logLevel: INFO
bbsimImg: ''
- rwCoreImg: ''
+ rwCoreImg: 'matteoscandolo/voltha-rw-core:voltha-2.4-dev'
ofAgentImg: ''
openoltAdapterImg: matteoscandolo/voltha-openolt-adapter:per-gem-lock
openonuAdapterImg: ''
- onosImg: ''
+ onosImg: andreacampanella/voltha-onos:eapol-retry
# development pipeline
- 'voltha-scale-measurements-dev':