Remove Docker Registry access (login).

This commit is contained in:
John Blum
2022-05-04 11:24:16 -07:00
parent 3810f53b93
commit 9c641f4b24
2 changed files with 44 additions and 50 deletions

88
Jenkinsfile vendored
View File

@@ -1,10 +1,12 @@
def p = [:]
node {
checkout scm
p = readProperties interpolate: true, file: 'ci/pipeline.properties'
}
pipeline {
agent none
triggers {
@@ -35,16 +37,14 @@ pipeline {
}
steps {
script {
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*"`'
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 clean dependency:list test -Dsort -U -B'
}
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*"`'
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 clean dependency:list test -Dsort -U -B'
}
}
}
@@ -69,16 +69,14 @@ pipeline {
}
steps {
script {
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
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 clean dependency:list test -Dsort -U -B'
}
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 clean dependency:list test -Dsort -U -B'
}
}
}
@@ -94,16 +92,14 @@ pipeline {
}
steps {
script {
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
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 remote-java17 clean dependency:list test -Dsort -U -B'
}
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 remote-java17 clean dependency:list test -Dsort -U -B'
}
}
}
@@ -130,23 +126,21 @@ pipeline {
steps {
script {
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*"`'
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 -Pci,artifactory ' +
'-Dartifactory.server=https://repo.spring.io ' +
"-Dartifactory.username=${ARTIFACTORY_USR} " +
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
"-Dartifactory.staging-repository=libs-snapshot-local " +
"-Dartifactory.build-name=spring-data-geode " +
"-Dartifactory.build-number=${BUILD_NUMBER} " +
'-Dmaven.test.skip=true clean deploy -U -B'
}
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*"`'
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 -Pci,artifactory ' +
'-Dartifactory.server=https://repo.spring.io ' +
"-Dartifactory.username=${ARTIFACTORY_USR} " +
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
"-Dartifactory.staging-repository=libs-snapshot-local " +
"-Dartifactory.build-name=spring-data-geode " +
"-Dartifactory.build-number=${BUILD_NUMBER} " +
'-Dmaven.test.skip=true clean deploy -U -B'
}
}
}

View File

@@ -21,9 +21,9 @@ docker.cassandra.3.version=3.11.12
# 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
docker.java.inside.docker=-u root -v /usr/bin/docker:/usr/bin/docker -v /var/run/docker.sock:/var/run/docker.sock -v $HOME:/tmp/jenkins-home
# Credentials
docker.registry=
docker.credentials=hub.docker.com-springbuildmaster
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
docker.credentials=hub.docker.com-springbuildmaster
docker.registry=