Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: devicehive/devicehive-java-server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7c25e374d4b2940bdeadf54d242d63e7fe91435e
Choose a base ref
..
head repository: devicehive/devicehive-java-server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 20b1254a5a926839ebb8672021fa629080a92b3a
Choose a head ref
Showing with 5 additions and 3 deletions.
  1. +5 −3 Jenkinsfile
8 changes: 5 additions & 3 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!groovy

properties([
buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '32', daysToKeepStr: '', numToKeepStr: '100'))
])
@@ -10,7 +12,7 @@ def test_rpc = true
stage('Build jars') {
node('docker') {
echo 'Building jars ...'
def maven = docker.image('maven:3.5.3-jdk-8')
def maven = docker.image('maven:3.5.4-jdk-8')
maven.pull()
maven.inside {
checkout scm
@@ -59,7 +61,7 @@ if (test_branches.contains(env.BRANCH_NAME)) {
clone_devicehive_docker()
dir('devicehive-docker/rdbms-image'){
writeFile file: '.env', text: """COMPOSE_PROJECT_NAME=rpc
COMPOSE_FILE=docker-compose.yml:ci-images.yml:dh_proxy_custom_certificate.yml:dh_plugin.yml:dh_plugin-ci-image.yml
COMPOSE_FILE=docker-compose.yml:ci-images.yml:dh_proxy_custom_certificate.yml:dh_plugin.yml:dh_plugin-ci-image.yml:cadvisor.yml
DH_TAG=${BRANCH_NAME}
JWT_SECRET=devicehive
DH_FE_SPRING_PROFILES_ACTIVE=rpc-client
@@ -87,7 +89,7 @@ if (test_branches.contains(env.BRANCH_NAME)) {
clone_devicehive_docker()
dir('devicehive-docker/rdbms-image'){
writeFile file: '.env', text: """COMPOSE_PROJECT_NAME=wsproxy
COMPOSE_FILE=docker-compose.yml:ci-images.yml:dh_proxy_custom_certificate.yml:dh_plugin.yml:dh_plugin-ci-image.yml
COMPOSE_FILE=docker-compose.yml:ci-images.yml:dh_proxy_custom_certificate.yml:dh_plugin.yml:dh_plugin-ci-image.yml:cadvisor.yml
DH_TAG=${BRANCH_NAME}
JWT_SECRET=devicehive
"""