VOL-2827 Update periodic jobs for 2.3 release
Change-Id: I95efe673130080e2e61f26378a8da2c7f1abf937
diff --git a/jjb/pipeline/voltha-go-multi-tests.groovy b/jjb/pipeline/voltha-go-multi-tests.groovy
index 4d0fde1..67bc458 100644
--- a/jjb/pipeline/voltha-go-multi-tests.groovy
+++ b/jjb/pipeline/voltha-go-multi-tests.groovy
@@ -37,7 +37,6 @@
DEPLOY_K8S="y"
VOLTHA_LOG_LEVEL="DEBUG"
CONFIG_SADIS="n"
- EXTRA_HELM_FLAGS="--set log_agent.enabled=False ${params.extraHelmFlags}"
ROBOT_MISC_ARGS="${params.extraRobotArgs} -d $WORKSPACE/RobotLogs"
}
stages {
@@ -76,6 +75,15 @@
stage('Deploy Voltha') {
steps {
sh """
+ if [ "${manifestBranch}" != "master" ]; then
+ echo "on branch: ${manifestBranch}, sourcing kind-voltha/releases/${manifestBranch}"
+ source "$HOME/kind-voltha/releases/${manifestBranch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
+
+ EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${params.extraHelmFlags} "
+
cd $HOME/kind-voltha/
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down || ./voltha down
./voltha up
diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index 38efb38..20e9fc7 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -37,7 +37,6 @@
DEPLOY_K8S="y"
VOLTHA_LOG_LEVEL="DEBUG"
CONFIG_SADIS="n"
- EXTRA_HELM_FLAGS="--set log_agent.enabled=False ${params.extraHelmFlags}"
ROBOT_MISC_ARGS="${params.extraRobotArgs} -d $WORKSPACE/RobotLogs"
}
stages {
@@ -76,6 +75,15 @@
stage('Deploy Voltha') {
steps {
sh """
+ if [ "${manifestBranch}" != "master" ]; then
+ echo "on branch: ${manifestBranch}, sourcing kind-voltha/releases/${manifestBranch}"
+ source "$HOME/kind-voltha/releases/${manifestBranch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
+
+ EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${params.extraHelmFlags} "
+
cd $HOME/kind-voltha/
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down || ./voltha down
./voltha up
diff --git a/jjb/pipeline/voltha-system-test-bbsim.groovy b/jjb/pipeline/voltha-system-test-bbsim.groovy
index e639d4a..0f674bd 100644
--- a/jjb/pipeline/voltha-system-test-bbsim.groovy
+++ b/jjb/pipeline/voltha-system-test-bbsim.groovy
@@ -66,6 +66,13 @@
stage('Deploy Voltha') {
steps {
sh """
+ if [ "${manifestBranch}" != "master" ]; then
+ echo "on branch: ${manifestBranch}, sourcing kind-voltha/releases/${manifestBranch}"
+ source "$HOME/kind-voltha/releases/${manifestBranch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
+
pushd kind-voltha/
./voltha up
popd
@@ -77,7 +84,7 @@
steps {
sh '''
rm -rf $WORKSPACE/RobotLogs; mkdir -p $WORKSPACE/RobotLogs
- git clone https://gerrit.opencord.org/voltha-system-tests
+ git clone -b ${manifestBranch} https://gerrit.opencord.org/voltha-system-tests
make ROBOT_DEBUG_LOG_OPT="-l sanity_log.html -r sanity_report.html -o sanity_output.xml" -C $WORKSPACE/voltha-system-tests ${makeTarget}
'''
}
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 41b95c2..5892f75 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -11,17 +11,24 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-sanity-test'
build-node: 'qct-pod4-node2'
- default-image-tag: 'master'
code-branch: 'master'
make-target: sanity-multi-kind
onus: 2
pons: 2
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/6 * * *"
+
+ - 'voltha-periodic-test':
+ name: 'periodic-voltha-sanity-test-2.3'
+ build-node: 'qct-pod4-node2'
+ code-branch: 'voltha-2.3'
+ make-target: sanity-multi-kind
+ onus: 2
+ pons: 2
+ time-trigger: "H H/6 * * *"
- 'voltha-periodic-test':
name: 'periodic-voltha-functional-test'
build-node: 'qct-pod4-node2'
- default-image-tag: 'master'
code-branch: 'master'
make-target: functional-single-kind
onus: 1
@@ -29,9 +36,17 @@
time-trigger: "H H/12 * * *"
- 'voltha-periodic-test':
+ name: 'periodic-voltha-functional-test-2.3'
+ build-node: 'qct-pod4-node2'
+ code-branch: 'voltha-2.3'
+ make-target: functional-single-kind
+ onus: 1
+ pons: 1
+ time-trigger: "H H/12 * * *"
+
+ - 'voltha-periodic-test':
name: 'periodic-voltha-errorscenarios-test'
build-node: 'qct-pod4-node2'
- default-image-tag: 'master'
code-branch: 'master'
make-target: bbsim-errorscenarios
onus: 1
@@ -42,7 +57,6 @@
name: 'periodic-voltha-system-test'
pipeline-script: 'voltha-system-test-bbsim.groovy'
build-node: 'ubuntu16.04-basebuild-4c-8g'
- default-image-tag: 'master'
code-branch: 'master'
make-target: sanity-multi-kind
onus: 2
@@ -50,37 +64,74 @@
time-trigger: "H H/12 * * *"
- 'voltha-periodic-test':
+ name: 'periodic-voltha-system-test-2.3'
+ pipeline-script: 'voltha-system-test-bbsim.groovy'
+ build-node: 'ubuntu16.04-basebuild-4c-8g'
+ code-branch: 'voltha-2.3'
+ make-target: sanity-multi-kind
+ onus: 2
+ pons: 2
+ time-trigger: "H H/12 * * *"
+
+
+ - 'voltha-periodic-test':
name: 'periodic-voltha-sanity-test-multi-runs'
pipeline-script: 'voltha-go-multi-tests.groovy'
build-node: 'qct-pod4-node2'
- default-image-tag: 'master'
code-branch: 'master'
make-target: sanity-kind
onus: 1
pons: 1
test-runs: 5
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/6 * * *"
+
+ - 'voltha-periodic-test':
+ name: 'periodic-voltha-sanity-test-multi-runs-2.3'
+ pipeline-script: 'voltha-go-multi-tests.groovy'
+ build-node: 'qct-pod4-node2'
+ code-branch: 'voltha-2.3'
+ make-target: sanity-kind
+ onus: 1
+ pons: 1
+ test-runs: 5
+ time-trigger: "H H/6 * * *"
- 'voltha-periodic-test':
name: 'periodic-voltha-scale-test'
build-node: 'qct-pod4-node2'
- default-image-tag: 'master'
code-branch: 'master'
make-target: scale-multi-kind
onus: 2
pons: 8
- time-trigger: "H H/3 * * *"
+ time-trigger: "H H/6 * * *"
+
+ - 'voltha-periodic-test':
+ name: 'periodic-voltha-scale-test-2.3'
+ build-node: 'qct-pod4-node2'
+ code-branch: 'voltha-2.3'
+ make-target: scale-multi-kind
+ onus: 2
+ pons: 8
+ time-trigger: "H H/6 * * *"
- 'voltha-periodic-test':
name: 'periodic-voltha-alarm-test'
build-node: 'qct-pod4-node2'
- default-image-tag: 'master'
code-branch: 'master'
make-target: bbsim-alarms-kind
onus: 1
pons: 1
time-trigger: "H H/3 * * *"
+ - 'voltha-periodic-test':
+ name: 'periodic-voltha-alarm-test-2.3'
+ build-node: 'qct-pod4-node2'
+ code-branch: 'voltha-2.3'
+ make-target: bbsim-alarms-kind
+ onus: 1
+ pons: 1
+ time-trigger: "H H/3 * * *"
+
# Per-patchset Pod builds on Tucson pod
- 'verify_physical_voltha_patchset_auto':
name: 'verify_physical_voltha_patchset_auto'
@@ -138,7 +189,7 @@
- string:
name: extraHelmFlags
- default: '--set defaults.image_tag={default-image-tag},onu={onus},pon={pons}'
+ default: '--set onu={onus},pon={pons}'
description: 'Helm flags to pass to ./voltha up'
- string:
@@ -195,8 +246,6 @@
- job-template:
id: 'voltha-patch-test'
name: 'verify_{project}_sanity-test{name-extension}'
- extra-helm-flags: ''
- skip-vote: false
description: |
<!-- Managed by Jenkins Job Builder -->
@@ -246,7 +295,7 @@
- string:
name: extraHelmFlags
- default: '{extra-helm-flags}'
+ default: ''
description: 'Helm flags to pass to ./voltha up'
project-type: pipeline
@@ -276,11 +325,6 @@
file-paths:
- compare-type: REG_EXP
pattern: '{all-files-regexp}'
- skip-vote:
- successful: '{skip-vote}'
- failed: '{skip-vote}'
- unstable: '{skip-vote}'
- notbuilt: '{skip-vote}'
# POD Per Patchset Pipeline Jobs