Merge "Adding .lock files to ignore list"
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/packer/provision/basebuild.sh b/packer/provision/basebuild.sh
index 596c24c..17d68e0 100644
--- a/packer/provision/basebuild.sh
+++ b/packer/provision/basebuild.sh
@@ -167,6 +167,14 @@
go get -v github.com/t-yuki/gocover-cobertura
go get -v github.com/jstemmer/go-junit-report
+ # dep for go package dependencies w/versioning, version v0.5.0, adapted from:
+ # https://golang.github.io/dep/docs/installation.html#install-from-source
+ go get -d -u github.com/golang/dep
+ pushd $(go env GOPATH)/src/github.com/golang/dep
+ git checkout "v0.5.0"
+ go install -ldflags="-X main.version=v0.5.0" ./cmd/dep
+ popd
+
# ubuntu 16.04 installs the node binary as /usr/bin/nodejs, which breaks
# tools that expect it to be named just `node`. Symlink it to fix
ln -s /usr/bin/nodejs /usr/local/bin/node