Merge "Enforce SCA checks missing from voltha repos"
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index ff05de9..b8cff5d 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -979,6 +979,10 @@
default: '{manifest-branch}'
description: 'Repo manifest branch for code checkout (so we can display changes in Jenkins)'
+ - bool:
+ name: powerSwitch
+ default: '{power-switch}'
+ description: "Indicate whether POD has power switch to reboot ONUs/OLT remotely"
concurrent: true
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 26ab698..e56b086 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -10,6 +10,7 @@
with-kind: false
onos-version: '2.2'
+ power-switch: False
jobs:
# flex OCP pod with olt/onu - manual test job, voltha master build job
@@ -73,6 +74,7 @@
release: 'master'
branch: 'master'
released: false
+ power-switch: True
test-repo: 'voltha-system-tests'
profile: 'Default'
@@ -97,6 +99,7 @@
release: 'master'
branch: 'master'
released: false
+ power-switch: True
test-repo: 'voltha-system-tests'
profile: '1T4GEM-bal31'
@@ -106,7 +109,6 @@
config-pod: 'flex-ocp-cord'
release: 'release'
branch: 'master'
- onos-version: '1.13.9'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
oltDebVersion: 'openolt_asfvolt16.deb'
@@ -155,7 +157,6 @@
config-pod: 'onf-demo-pod'
release: 'release'
branch: 'master'
- onos-version: '1.13.9'
released: true
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index 7993e2d..84d0f97 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -64,7 +64,7 @@
"""
}
}
- stage('Subscriber Validation and Ping Tests') {
+ stage('Functional Tests') {
environment {
ROBOT_CONFIG_FILE="$WORKSPACE/${configBaseDir}/${configDeploymentDir}/${configFileName}.yaml"
ROBOT_FILE="Voltha_PODTests.robot"
@@ -99,7 +99,11 @@
steps {
sh """
mkdir -p $ROBOT_LOGS_DIR
- export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functional -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
+ if ( ${powerSwitch} ); then
+ export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functional -i PowerSwitch -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
+ else
+ export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functional -e PowerSwitch -d $ROBOT_LOGS_DIR -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-test || true
"""
}
diff --git a/jjb/verify/voltha-helm-charts.yaml b/jjb/verify/voltha-helm-charts.yaml
index fd88c24..c7389bb 100644
--- a/jjb/verify/voltha-helm-charts.yaml
+++ b/jjb/verify/voltha-helm-charts.yaml
@@ -21,4 +21,4 @@
dependency-jobs: 'verify_voltha-helm-charts_helm-lint'
build-timeout: 20
pipeline-script: 'voltha-bbsim-tests.groovy'
- extra-helm-flags: '--set defaults.image_tag=null,images.onos.tag=2.2.0'
+ extra-helm-flags: '--set defaults.image_tag=null,images.onos.tag=4.0.0,images.onos.repository=voltha/voltha-onos'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 76d64b0..f898a90 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -240,15 +240,15 @@
project-pattern: '^{project}$'
branches:
- branch-compare-type: REG_EXP
- branch-pattern: '^{project}$'
+ branch-pattern: '{branch-regexp}'
file-paths:
- compare-type: REG_EXP
pattern: '{all-files-regexp}'
skip-vote:
- success: {skip-vote}
- failed: {skip-vote}
- unstable: {skip-vote}
- notbuilt: {skip-vote}
+ successful: '{skip-vote}'
+ failed: '{skip-vote}'
+ unstable: '{skip-vote}'
+ notbuilt: '{skip-vote}'
# POD Per Patchset Pipeline Jobs