Merge "[VOL-2992] Fixing typo in ofagent image name"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index c19d8f0..84a5695 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -139,6 +139,8 @@
release: 'master'
branch: 'master'
num-of-openonu: '2'
+ num-of-onos: '3'
+ num-of-atomix: '3'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
@@ -186,6 +188,8 @@
release: 'master'
branch: 'master'
num-of-openonu: '2'
+ num-of-onos: '3'
+ num-of-atomix: '3'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
@@ -308,6 +312,8 @@
release: 'master'
branch: 'master'
num-of-openonu: '2'
+ num-of-onos: '3'
+ num-of-atomix: '3'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
@@ -418,7 +424,7 @@
profile: 'Default'
power-switch: True
- # Berlin pod with gpon olt/onu - master Default tech profile and timer based job
+ # Berlin pod with gpon olt/onu - master 1T8GEM tech profile and timer based job
- 'build_voltha_pod_release':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-gpon'
@@ -431,12 +437,12 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
oltDebVersion: 'openolt_asgvolt64.deb'
configurePod: true
- profile: 'Default'
+ profile: '1T8GEM'
with-kind: true
time: '11'
- # Berlin POD test job - master versions: uses tech profile on voltha branch
+ # Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
- 'build_voltha_pod_test':
build-node: 'dt-berlin-community-pod'
config-pod: 'dt-berlin-pod-gpon'
@@ -445,6 +451,6 @@
release: 'master'
branch: 'master'
test-repo: 'voltha-system-tests'
- profile: 'Default'
+ profile: '1T8GEM'
power-switch: True
pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
diff --git a/jjb/device-management.yaml b/jjb/device-management.yaml
index ea1b9fc..aa8014f 100644
--- a/jjb/device-management.yaml
+++ b/jjb/device-management.yaml
@@ -244,4 +244,7 @@
branches:
- branch-compare-type: PLAIN
branch-pattern: 'master'
+ - timed: |
+ TZ=America/Los_Angeles
+ {time-trigger}
diff --git a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
index a576bc0..b03f9e2 100644
--- a/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-dt-physical-functional-tests.groovy
@@ -135,7 +135,7 @@
stage('Dataplane Tests') {
environment {
- ROBOT_CONFIG_FILE="$WORKSPACE/${configBaseDir}/${configDeploymentDir}/${configFileName}.yaml"
+ ROBOT_CONFIG_FILE="$WORKSPACE/${configBaseDir}/${configDeploymentDir}/${configFileName}-DT.yaml"
ROBOT_FILE="Voltha_DT_PODTests.robot"
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow/DataplaneTests"
}
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 27b5cca..fc33790 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -410,6 +410,8 @@
kubectl logs -l app=ofagent > $WORKSPACE/logs/voltha-ofagent-logs.logs
kubectl logs -l app=bbsim > $WORKSPACE/logs/bbsim-logs.logs
kubectl logs -l app=onos > $WORKSPACE/logs/onos-logs.logs
+ kubectl logs -l app=etcd > $WORKSPACE/logs/etcd-logs.logs
+ kubectl logs -l app=kafka > $WORKSPACE/logs/kafka-logs.logs
'''
archiveArtifacts artifacts: 'kind-voltha/install-minimal.log,execution-time.txt,logs/*,logs/pprof/*,RobotLogs/*,plots/*.txt'
}