Spring/spring-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Extract Docker and Artifactory credentials into properties file.

See #569
This commit is contained in:
Mark Paluch
2022-02-04 11:37:00 +01:00
parent 85f63ea344
commit 1f4395c386
2 changed files with 19 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
Jenkinsfile vendored
View File

@@ -31,11 +31,11 @@ pipeline {
}
options { timeout(time: 30, unit: 'MINUTES') }
environment {
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
}
steps {
script {
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
@@ -50,67 +50,6 @@ pipeline {
}
}
stage("Test other configurations") {
when {
beforeAgent(true)
allOf {
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
not { triggeredBy 'UpstreamCause' }
}
}
parallel {
stage("test: baseline (next)") {
agent {
label 'data'
}
options { timeout(time: 30, unit: 'MINUTES') }
environment {
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
}
steps {
script {
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'
sh 'rm -Rf `find . -name "newDB"`'
sh 'rm -Rf `find . -name "server" | grep -v "src"`'
sh 'rm -Rf `find . -name "*.log"`'
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Duser.dir=$PWD -Djava.io.tmpdir=/tmp" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -U -B'
}
}
}
}
}
stage("test: baseline (LTS)") {
agent {
label 'data'
}
options { timeout(time: 30, unit: 'MINUTES') }
environment {
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
}
steps {
script {
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'
sh 'rm -Rf `find . -name "newDB"`'
sh 'rm -Rf `find . -name "server" | grep -v "src"`'
sh 'rm -Rf `find . -name "*.log"`'
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Duser.dir=$PWD -Djava.io.tmpdir=/tmp" ./mvnw -s settings.xml -P java11,remote-java17 clean dependency:list test -Dsort -U -B'
}
}
}
}
}
}
}
stage('Release to artifactory') {
when {
beforeAgent(true)
@@ -125,12 +64,12 @@ pipeline {
options { timeout(time: 20, unit: 'MINUTES') }
environment {
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
}
steps {
script {
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'

19
ci/pipeline.properties
View File

@@ -1,13 +1,24 @@
# Java versions
java.main.tag=17.0.2_8-jdk
java.next.tag=17.0.2_8-jdk
java.lts.tag=17.0.2_8-jdk
# Docker container images - standard
docker.java.main.image=eclipse-temurin:${java.main.tag}
docker.java.next.image=eclipse-temurin:${java.next.tag}
docker.java.lts.image=eclipse-temurin:${java.lts.tag}
# Supported versions of MongoDB
docker.mongodb.4.4.version=4.4.4
docker.mongodb.5.0.version=5.0.3
# Supported versions of Redis
docker.redis.6.version=6.2.4
# Supported versions of Cassandra
docker.cassandra.3.version=3.11.11
# Docker environment settings
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home
# Credentials
docker.registry=
docker.credentials=hub.docker.com-springbuildmaster
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c