Merge "Add docker-publish and license scan jobs for upf-epc repo"
diff --git a/jjb/docker-publish-github.yaml b/jjb/docker-publish-github.yaml
index 148c228..6df76ec 100644
--- a/jjb/docker-publish-github.yaml
+++ b/jjb/docker-publish-github.yaml
@@ -27,7 +27,7 @@
parameters:
- string:
name: buildNode
- default: 'ubuntu16.04-basebuild-1c-2g'
+ default: '{build-node}'
description: 'Name of the Jenkins node to run the job on'
- string:
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 2556471..5dc22a0 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -44,6 +44,7 @@
- 'docker-publish-github':
build-timeout: 30
docker-repo: 'omecproject'
+ build-node: 'ubuntu16.04-basebuild-4c-8g'
# for c3po
- project:
@@ -76,6 +77,7 @@
- 'docker-publish-github':
build-timeout: 30
docker-repo: 'omecproject'
+ build-node: 'ubuntu16.04-basebuild-1c-2g'
# for openmme
- project:
@@ -105,6 +107,7 @@
- 'docker-publish-github':
build-timeout: 30
docker-repo: 'omecproject'
+ build-node: 'ubuntu16.04-basebuild-1c-2g'
# for nucleus
- project:
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 74e9613..ca289ab 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -115,6 +115,11 @@
make-local voltha-openolt-adapter
make-local voltha-openonu-adapter
make-local ofagent-py
+ elif [ "${gerritProject}" = "voltctl" ]; then
+ # Set and handle GOPATH and PATH
+ export GOPATH=\${GOPATH:-$WORKSPACE/go}
+ export PATH=\$PATH:/usr/lib/go-1.12/bin:/usr/local/go/bin:\$GOPATH/bin
+ make -C $WORKSPACE/voltha/voltctl/ build
elif ! [[ "${gerritProject}" =~ ^(voltha-helm-charts|voltha-system-tests)\$ ]]; then
make-local ${gerritProject}
fi
@@ -132,7 +137,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 +201,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 +250,7 @@
sync
pkill kail || true
+ md5sum $WORKSPACE/kind-voltha/bin/voltctl
## Pull out errors from log files
extract_errors_go() {
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'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 6dac951..ad8b020 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -132,6 +132,15 @@
pons: 1
time-trigger: "H H/3 * * *"
+ - 'voltha-periodic-test':
+ name: 'nightly-voltha-DTflow-sanity-test'
+ build-node: 'ubuntu16.04-basebuild-4c-8g'
+ code-branch: 'master'
+ make-target: sanity-kind-dt
+ onus: 1
+ pons: 1
+ time-trigger: "@daily"
+
# Per-patchset Pod builds on Tucson pod
- 'verify_physical_voltha_patchset_auto':
name: 'verify_physical_voltha_patchset_auto'