Merge "invoke 'dep ensure' when building sadis-server"
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 1273c50..b7ae876 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -86,6 +86,16 @@
default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
description: ''
+ - bool:
+ name: installBBSim
+ default: false
+ description: "Install the BBSim container"
+
+ - string:
+ name: onuNumber
+ default: '16'
+ description: "Onus per PonPort"
+
concurrent: true
pipeline-scm:
diff --git a/jjb/maven.yaml b/jjb/maven.yaml
index 0d37e6b..00fa36f 100644
--- a/jjb/maven.yaml
+++ b/jjb/maven.yaml
@@ -9,10 +9,7 @@
Created by {id} job-template from ci-management/jjb/maven.yaml
node: 'ubuntu16.04-basebuild-1c-2g'
- project-type: maven
- maven:
- root-pom: pom.xml
- goals: 'clean install'
+ project-type: freestyle
parameters:
- string:
@@ -47,6 +44,19 @@
choosing-strategy: 'gerrit'
shallow-clone: true
+ builders:
+ # NOTE: this env var is only required to fix a bug in the "surefire" dependency:
+ # https://issues.apache.org/jira/browse/SUREFIRE-1588
+ # https://github.com/apache/maven-surefire/pull/197
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
+ # should be removed as soon as this problem is resolved
+ - inject:
+ properties-content: |
+ _JAVA_OPTIONS=-Djdk.net.URLClassPath.disableClassPathURLCheck=true
+ - maven-target:
+ pom: pom.xml
+ goals: 'clean install'
+
- job-template:
id: maven-test
@@ -87,6 +97,15 @@
project-type: maven
concurrent: true
- maven:
- root-pom: 'pom.xml'
- goals: 'test'
+ builders:
+ # NOTE: this env var is only required to fix a bug in the "surefire" dependency:
+ # https://issues.apache.org/jira/browse/SUREFIRE-1588
+ # https://github.com/apache/maven-surefire/pull/197
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
+ # should be removed as soon as this problem is resolved
+ - inject:
+ properties-content: |
+ _JAVA_OPTIONS=-Djdk.net.URLClassPath.disableClassPathURLCheck=true
+ - maven-target:
+ pom: pom.xml
+ goals: 'test'
diff --git a/jjb/shell/licensecheck.sh b/jjb/shell/licensecheck.sh
index af725f9..80b6a02 100755
--- a/jjb/shell/licensecheck.sh
+++ b/jjb/shell/licensecheck.sh
@@ -97,6 +97,7 @@
! -path "*conf*" \
! -path "*git*" \
! -path "*swagger*" \
+ ! -path "*.lock*" \
-print0 )
exit ${fail_licensecheck}