Merge "Enabling scale jobs"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 0a7473c..355df14 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -476,7 +476,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T8GEM'
- time: '20'
+ time: '18'
# Berlin POD test job - master versions: uses tech profile on voltha branch
@@ -506,8 +506,10 @@
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
+ disable-job: true
profile: '1T8GEM'
- time: '1'
+ # Update this value accordingly once the job is enabled
+ time: ''
# Berlin POD test job - voltha-2.6 versions: two OLTs
@@ -566,7 +568,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T8GEM'
- time: '6'
+ time: '1'
# Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
@@ -599,7 +601,7 @@
profile: '1T8GEM'
reinstall-olt: false
openoltAdapterChart: '/home/community/adtran-2021-01-29/voltha-adapter-adtran-olt'
- time: '11'
+ time: '7'
# Berlin POD adtran test job - master versions: uses 1T8GEM tech profile on voltha branch
@@ -631,7 +633,7 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T8GEM'
- time: '16'
+ time: '13'
# Berlin POD test job - voltha-2.5 versions: uses 1T8GEM tech profile on voltha branch
@@ -662,7 +664,8 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T8GEM'
- time: '9'
+ # Update this value accordingly once the job is enabled
+ time: ''
# Berlin POD test job - master versions, uses 1T8GEM tech profile and openonu go on voltha branch
diff --git a/jjb/pipeline/voltha-physical-soak-dt-tests.groovy b/jjb/pipeline/voltha-physical-soak-dt-tests.groovy
index 6d9aa6a..ccb918a 100644
--- a/jjb/pipeline/voltha-physical-soak-dt-tests.groovy
+++ b/jjb/pipeline/voltha-physical-soak-dt-tests.groovy
@@ -172,18 +172,18 @@
}
steps {
sh """
- cd $WORKSPACE/voltha/kind-voltha/scripts
+ cd $WORKSPACE/kind-voltha/scripts
./log-collector.sh > /dev/null &
./log-combine.sh > /dev/null &
mkdir -p $ROBOT_LOGS_DIR
if [ "${params.testType}" == "Functional" ]; then
if ( ${powerSwitch} ); then
- export ROBOT_MISC_ARGS="--removekeywords wuks -i PowerSwitch -i soak -e bbsim -e notready -d $ROBOT_LOGS_DIR -v teardown_device:False -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
+ export ROBOT_MISC_ARGS="--removekeywords wuks -i PowerSwitch -i soak -e dataplaneDt -e bbsim -e notready -d $ROBOT_LOGS_DIR -v teardown_device:False -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
else
- export ROBOT_MISC_ARGS="--removekeywords wuks -e PowerSwitch -i soak -e bbsim -e notready -d $ROBOT_LOGS_DIR -v teardown_device:False -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
+ export ROBOT_MISC_ARGS="--removekeywords wuks -e PowerSwitch -i soak -e dataplaneDt -e bbsim -e notready -d $ROBOT_LOGS_DIR -v teardown_device:False -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
fi
- make -C $WORKSPACE/voltha/voltha-system-tests voltha-dt-test || true
+ make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
fi
"""
}
@@ -200,7 +200,7 @@
mkdir -p $ROBOT_LOGS_DIR
if [ "${params.testType}" == "Failure" ]; then
export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i soak -e PowerSwitch -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
- make -C $WORKSPACE/voltha/voltha-system-tests voltha-dt-test || true
+ make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
fi
"""
}
@@ -217,7 +217,7 @@
mkdir -p $ROBOT_LOGS_DIR
if [ "${params.testType}" == "Dataplane" ]; then
export ROBOT_MISC_ARGS="--removekeywords wuks -i BandwidthProfileUDPDt -i TechProfileDt -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
- make -C $WORKSPACE/voltha/voltha-system-tests voltha-dt-test || true
+ make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
fi
"""
}
@@ -242,14 +242,14 @@
extract_errors_go() {
echo
echo "Error summary for $1:"
- grep '"level":"error"' $WORKSPACE/voltha/kind-voltha/scripts/logger/combined/$1*
+ grep '"level":"error"' $WORKSPACE/kind-voltha/scripts/logger/combined/$1*
echo
}
extract_errors_python() {
echo
echo "Error summary for $1:"
- grep 'ERROR' $WORKSPACE/voltha/kind-voltha/scripts/logger/combined/$1*
+ grep 'ERROR' $WORKSPACE/kind-voltha/scripts/logger/combined/$1*
echo
}
@@ -259,7 +259,7 @@
extract_errors_python voltha-ofagent >> $WORKSPACE/error-report.log
extract_errors_python onos >> $WORKSPACE/error-report.log
- cd $WORKSPACE/voltha/kind-voltha/scripts/logger/combined/
+ cd $WORKSPACE/kind-voltha/scripts/logger/combined/
tar czf $WORKSPACE/container-logs.tgz *
cd $WORKSPACE
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index e185c53..4bfff33 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -32,7 +32,7 @@
olts: 1
onus: 2
pons: 2
- time-trigger: "H H/12 * * *"
+ time-trigger: "H H/23 * * *"
- 'voltha-periodic-test':
name: 'periodic-voltha-multiple-olts-test-bbsim'
@@ -48,7 +48,7 @@
olts: 2
onus: 2
pons: 2
- time-trigger: "H H/12 * * *"
+ time-trigger: "H H/23 * * *"
- 'voltha-periodic-test':
name: 'periodic-voltha-2.6-multiple-olts-test-bbsim'
@@ -64,7 +64,7 @@
olts: 2
onus: 2
pons: 2
- time-trigger: "H H/12 * * *"
+ time-trigger: "H H/23 * * *"
- 'voltha-periodic-test':
name: 'periodic-voltha-openonu-go-test-bbsim'
@@ -98,7 +98,7 @@
make-target: bbsim-dmi-hw-management-test
withAlarms: false
code-branch: 'master'
- time-trigger: "H H/12 * * *"
+ time-trigger: "H H/23 * * *"
- 'voltha-periodic-test':
name: 'periodic-voltha-test-DMI-2.6'
@@ -107,7 +107,7 @@
make-target: bbsim-dmi-hw-management-test
withAlarms: false
code-branch: 'voltha-2.6'
- time-trigger: "H H/12 * * *"
+ time-trigger: "H H/23 * * *"
- 'voltha-periodic-test':
name: 'periodic-voltha-test-bbsim-2.6'
@@ -121,7 +121,7 @@
code-branch: 'voltha-2.6'
onus: 2
pons: 2
- time-trigger: "H H/12 * * *"
+ time-trigger: "H H/23 * * *"
- 'voltha-periodic-test':
name: 'periodic-voltha-etcd-test'
@@ -153,7 +153,7 @@
onus: 1
pons: 1
test-runs: 5
- time-trigger: "H H/12 * * *"
+ time-trigger: "H H/23 * * *"
- 'voltha-periodic-test':
name: 'periodic-voltha-sanity-test-multi-runs-2.6'
@@ -164,7 +164,7 @@
onus: 1
pons: 1
test-runs: 5
- time-trigger: "H H/12 * * *"
+ time-trigger: "H H/23 * * *"
- 'voltha-periodic-test':
name: 'nightly-voltha-DTflow-sanity-test'