Merge "[VOL-2487] - Create a nightly job for DT based test on BBSIM"
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index f2922c9..b492b67 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -148,6 +148,27 @@
pipeline-file: 'omec-reuse-scan.groovy'
build-node: 'omec-qa'
+# for ignite
+- project:
+ name: ignite
+ project: '{name}'
+
+ build-node: 'intel-102'
+
+ github-organization: 'omec-project'
+
+ github_pr_auth_id: '64fe2b1a-b33a-4f13-8442-ad8360434003'
+ github_pr_org_list:
+ - 'omec-project'
+
+ jobs:
+ - 'omec-fossa':
+ pipeline-file: 'omec-fossa-scan.groovy'
+ build-node: 'omec-qa'
+ - 'omec-reuse':
+ pipeline-file: 'omec-reuse-scan.groovy'
+ build-node: 'omec-qa'
+
# Combined pipeline
- job-template:
id: 'omec-combined'
@@ -201,7 +222,6 @@
branches:
- 'master'
-
# install jobs, run for each project
- job-template:
id: 'omec-install'
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/omec-reuse-scan.groovy b/jjb/pipeline/omec-reuse-scan.groovy
index 6b471ab..ade6f6e 100644
--- a/jjb/pipeline/omec-reuse-scan.groovy
+++ b/jjb/pipeline/omec-reuse-scan.groovy
@@ -49,20 +49,26 @@
stage("Run REUSE Linter"){
steps {
- sh """
+ sh '''
#!/usr/bin/env bash
- cd ${params.project}
+ cd $project
git checkout FETCH_HEAD
git show
mkdir ../jenkins-license-scan
- cp --parents $(git diff-tree --no-commit-id --name-only -r HEAD) ../jenkins-license-scan
- cd ../jenkins-license-scan
+ modifiedFiles=$(git diff-tree --no-commit-id --name-only -r HEAD)
+ if [ -n "$modifiedFiles" ]
+ then
+ cp --parents "$modifiedFiles" ../jenkins-license-scan
+ cd ../jenkins-license-scan
- reuse download --all
- reuse lint
- """
+ reuse download --all
+ reuse lint
+ else
+ echo "There were no files to check. Skipping REUSE scan."
+ fi
+ '''
}
}
}
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 74e9613..f05d39d 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -115,6 +115,8 @@
make-local voltha-openolt-adapter
make-local voltha-openonu-adapter
make-local ofagent-py
+ elif [ "${gerritProject}" = "voltctl" ]; then
+ make -C $WORKSPACE/voltha/voltctl/ build
elif ! [[ "${gerritProject}" =~ ^(voltha-helm-charts|voltha-system-tests)\$ ]]; then
make-local ${gerritProject}
fi
@@ -132,7 +134,7 @@
echo "on master, using default settings for kind-voltha"
fi
- if ! [[ "${gerritProject}" =~ ^(voltha-helm-charts|voltha-system-tests)\$ ]]; then
+ if ! [[ "${gerritProject}" =~ ^(voltha-helm-charts|voltha-system-tests|voltctl)\$ ]]; then
export GOROOT=/usr/local/go
export GOPATH=\$(pwd)
docker images | grep citest
@@ -196,6 +198,12 @@
helm dep update \$VOLTHA_ADAPTER_OPEN_ONU_CHART
fi
+ if [ "${gerritProject}" = "voltctl" ]; then
+ export VOLTCTL_VERSION=$(cat $WORKSPACE/voltha/voltctl/VERSION)
+ cp $WORKSPACE/voltha/voltctl/voltctl $WORKSPACE/kind-voltha/bin/voltctl
+ md5sum $WORKSPACE/kind-voltha/bin/voltctl
+ fi
+
cd $WORKSPACE/kind-voltha/
echo \$EXTRA_HELM_FLAGS
kail -n voltha -n default > $WORKSPACE/onos-voltha-combined.log &
@@ -239,6 +247,7 @@
sync
pkill kail || true
+ md5sum $WORKSPACE/kind-voltha/bin/voltctl
## Pull out errors from log files
extract_errors_go() {
diff --git a/jjb/pipeline/voltha-system-test-bbsim.groovy b/jjb/pipeline/voltha-system-test-bbsim.groovy
index 6b0e44d..2d89c03 100644
--- a/jjb/pipeline/voltha-system-test-bbsim.groovy
+++ b/jjb/pipeline/voltha-system-test-bbsim.groovy
@@ -65,15 +65,16 @@
stage('Deploy Voltha') {
steps {
sh """
- EXTRA_HELM_FLAGS=""
- if [ "${manifestBranch}" != "master" ]; then
- echo "on branch: ${manifestBranch}, sourcing kind-voltha/releases/${manifestBranch}"
- source "$WORKSPACE/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
@@ -86,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/verify/voltctl.yaml b/jjb/verify/voltctl.yaml
index 9b586ab..74c98e2 100644
--- a/jjb/verify/voltctl.yaml
+++ b/jjb/verify/voltctl.yaml
@@ -24,6 +24,8 @@
unit-test-targets: 'lint sca test'
unit-test-keep-going: 'true'
dependency-jobs: 'verify_voltctl_tag-collision'
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha-bbsim-tests.groovy'
- job-group:
name: 'post-submit-voltctl-jobs'