Merge "Add license scan tests for the omec-project ignite repo."
diff --git a/jjb/cord-macros.yaml b/jjb/cord-macros.yaml
index 5a0f123..cc12b36 100644
--- a/jjb/cord-macros.yaml
+++ b/jjb/cord-macros.yaml
@@ -151,6 +151,12 @@
- type: JSONPath
key: merged
value: $.pull_request.merged
+ - type: JSONPath
+ key: branchName
+ value: $.pull_request.base.ref
+ - type: JSONPath
+ key: gitRef
+ value: $.pull_request.base.ref
regex-filter-text: $action,$merged
regex-filter-expression: ^(closed,true)$
cause: Generic Cause
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index d1344cb..9a9785b 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -118,6 +118,7 @@
config-pod: 'flex-ocp-cord'
release: '2.3'
branch: 'voltha-2.3'
+ power-switch: True
test-repo: 'voltha-system-tests'
profile: '1T4GEM'
@@ -187,7 +188,7 @@
test-repo: 'voltha-system-tests'
profile: '1T4GEM'
- # Menlo pod with olt/onu - Uses GO Version - Default tech profile and timer based job
+ # Menlo pod with olt/onu - master branch, Default tech profile and timer based job
- 'build_voltha_pod_release':
build-node: 'menlo-demo-pod'
config-pod: 'onf-demo-pod'
@@ -275,6 +276,28 @@
test-repo: 'voltha-system-tests'
profile: 'Default'
+ # Infosys pod with olt/onu - voltha-2.3 Default tech profile and timer based job
+ - 'build_voltha_pod_release':
+ build-node: 'infosys-test-pod'
+ config-pod: 'infosys-pod'
+ release: '2.3'
+ branch: 'voltha-2.3'
+ test-repo: 'voltha-system-tests'
+ Jenkinsfile: 'Jenkinsfile-voltha-build'
+ oltDebVersion: 'openolt_asfvolt16.deb'
+ configurePod: true
+ profile: 'Default'
+ time: '10'
+
+ # infosys test job - voltha-2.3 release job, uses Default tech profile on voltha branch
+ - 'build_voltha_pod_test':
+ build-node: 'infosys-test-pod'
+ config-pod: 'infosys-pod'
+ release: '2.3'
+ branch: 'voltha-2.3'
+ test-repo: 'voltha-system-tests'
+ profile: 'Default'
+
# Berlin pod with olt/onu - master versions Default tech profile and timer based job
- 'build_voltha_pod_release':
@@ -300,3 +323,28 @@
test-repo: 'voltha-system-tests'
profile: 'Default'
power-switch: True
+
+ # Berlin pod with olt/onu - voltha-2.3 Default tech profile and timer based job
+ - 'build_voltha_pod_release':
+ build-node: 'dt-berlin-community-pod'
+ config-pod: 'dt-berlin-pod'
+ release: '2.3'
+ branch: 'voltha-2.3'
+ test-repo: 'voltha-system-tests'
+ Jenkinsfile: 'Jenkinsfile-voltha-build'
+ oltDebVersion: 'openolt-2.3.0.deb'
+ configurePod: true
+ profile: 'Default'
+ with-kind: true
+ time: '11'
+
+
+ # Berlin POD test job - master versions: uses tech profile on voltha branch
+ - 'build_voltha_pod_test':
+ build-node: 'dt-berlin-community-pod'
+ config-pod: 'dt-berlin-pod'
+ release: '2.3'
+ branch: 'voltha-2.3'
+ test-repo: 'voltha-system-tests'
+ profile: 'Default'
+ power-switch: True
diff --git a/jjb/pipeline/omec-fossa-scan.groovy b/jjb/pipeline/omec-fossa-scan.groovy
index 613b03e..24c6cab 100644
--- a/jjb/pipeline/omec-fossa-scan.groovy
+++ b/jjb/pipeline/omec-fossa-scan.groovy
@@ -70,6 +70,9 @@
echo "Get FOSSA test results with 'fossa test'"
fossa test --no-ansi --verbose
+
+ echo "Display list of licenses detected by FOSSA using 'fossa report licenses'"
+ fossa report licenses
"""
}
diff --git a/jjb/pipeline/voltha-go-multi-tests.groovy b/jjb/pipeline/voltha-go-multi-tests.groovy
index 3f16f30..437b120 100644
--- a/jjb/pipeline/voltha-go-multi-tests.groovy
+++ b/jjb/pipeline/voltha-go-multi-tests.groovy
@@ -48,7 +48,7 @@
poll: false,
scm: [$class: 'RepoScm',
manifestRepositoryUrl: "${params.manifestUrl}",
- manifestBranch: "${params.manifestBranch}",
+ manifestBranch: "${params.branch}",
currentBranch: true,
destinationDir: 'voltha',
forceSync: true,
@@ -76,9 +76,9 @@
steps {
sh """
export EXTRA_HELM_FLAGS=""
- if [ "${manifestBranch}" != "master" ]; then
- echo "on branch: ${manifestBranch}, sourcing kind-voltha/releases/${manifestBranch}"
- source "$HOME/kind-voltha/releases/${manifestBranch}"
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$HOME/kind-voltha/releases/${branch}"
else
echo "on master, using default settings for kind-voltha"
fi
diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index d020fcc..fc1d613 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -48,7 +48,7 @@
poll: false,
scm: [$class: 'RepoScm',
manifestRepositoryUrl: "${params.manifestUrl}",
- manifestBranch: "${params.manifestBranch}",
+ manifestBranch: "${params.branch}",
currentBranch: true,
destinationDir: 'voltha',
forceSync: true,
@@ -76,9 +76,9 @@
steps {
sh """
export EXTRA_HELM_FLAGS=""
- if [ "${manifestBranch}" != "master" ]; then
- echo "on branch: ${manifestBranch}, sourcing kind-voltha/releases/${manifestBranch}"
- source "$HOME/kind-voltha/releases/${manifestBranch}"
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$HOME/kind-voltha/releases/${branch}"
else
echo "on master, using default settings for kind-voltha"
fi
diff --git a/jjb/pipeline/voltha-system-test-bbsim.groovy b/jjb/pipeline/voltha-system-test-bbsim.groovy
index 0f674bd..2d89c03 100644
--- a/jjb/pipeline/voltha-system-test-bbsim.groovy
+++ b/jjb/pipeline/voltha-system-test-bbsim.groovy
@@ -38,7 +38,6 @@
DEPLOY_K8S="y"
VOLTHA_LOG_LEVEL="DEBUG"
CONFIG_SADIS="y"
- EXTRA_HELM_FLAGS="${params.extraHelmFlags} --set voltha-etcd-cluster.clusterSize=3"
ROBOT_MISC_ARGS="-d $WORKSPACE/RobotLogs"
}
@@ -66,13 +65,17 @@
stage('Deploy Voltha') {
steps {
sh """
- if [ "${manifestBranch}" != "master" ]; then
- echo "on branch: ${manifestBranch}, sourcing kind-voltha/releases/${manifestBranch}"
- source "$HOME/kind-voltha/releases/${manifestBranch}"
+ export EXTRA_HELM_FLAGS=""
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$WORKSPACE/kind-voltha/releases/${branch}"
else
echo "on master, using default settings for kind-voltha"
fi
+ EXTRA_HELM_FLAGS+="${params.extraHelmFlags} --set voltha-etcd-cluster.clusterSize=3 "
+ echo \$EXTRA_HELM_FLAGS
+
pushd kind-voltha/
./voltha up
popd
@@ -84,7 +87,7 @@
steps {
sh '''
rm -rf $WORKSPACE/RobotLogs; mkdir -p $WORKSPACE/RobotLogs
- git clone -b ${manifestBranch} https://gerrit.opencord.org/voltha-system-tests
+ git clone -b ${branch} 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 5892f75..6dac951 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -200,12 +200,12 @@
- string:
name: manifestUrl
default: '{gerrit-server-url}/{voltha-test-manifest-repo}'
- description: 'Repo manifest URL for code checkout (so we can display changes in Jenkins)'
+ description: 'Repo manifest URL for code checkout'
- string:
- name: manifestBranch
+ name: branch
default: '{code-branch}'
- description: 'Repo manifest branch for code checkout (so we can display changes in Jenkins)'
+ description: 'Repo manifest branch for code checkout'
- string:
name: gerritProject