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

Refine CI parameters.

Browse Source 
See #917
This commit is contained in:
Mark Paluch
2025-06-11 14:43:03 +02:00
parent fc45bd69e9
commit 547704a934
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@@ -60,10 +60,10 @@ pipeline {
steps {
script {
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
docker.image("${p['docker.image']}").inside(p['docker.java.inside.basic']) {
docker.image("${p['docker.image']}").inside(p['docker.java.inside.docker']) {
sh 'src/test/bash/create_certificates.sh'
sh '/opt/vault/vault server -config=$(pwd)/src/test/bash/vault.conf &'
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-vault" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
}
}
}
@@ -81,7 +81,7 @@ pipeline {
agent {
docker {
image "${p['docker.image']}"
args "${p['docker.java.inside.basic']}"
args "${p['docker.java.inside.docker']}"
registryUrl "${p['docker.proxy.registry']}"
registryCredentialsId "${p['docker.proxy.credentials']}"
}

4
ci/deploy-milestone.sh
View File

@@ -2,7 +2,7 @@
set -euo pipefail
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw -s settings.xml -Pci,milestone,artifactory,release \
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-vault" ./mvnw -s settings.xml -Pci,milestone,artifactory,release \
-Dartifactory.server=https://repo.spring.io \
-Dartifactory.username=${ARTIFACTORY_USR} \
-Dartifactory.password=${ARTIFACTORY_PSW} \
@@ -11,7 +11,7 @@ MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw -s settings.xml -
-Dartifactory.build-number=${BUILD_NUMBER} \
clean deploy -U -B
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw -s settings.xml -Pdistribute \
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-vault" ./mvnw -s settings.xml -Pdistribute \
-Dartifactory.server=https://repo.spring.io \
-Dartifactory.username=${ARTIFACTORY_USR} \
-Dartifactory.password=${ARTIFACTORY_PSW} \

4
ci/deploy-release.sh
View File

@@ -8,13 +8,13 @@ export GNUPGHOME
mkdir $GNUPGHOME
cp $KEYRING $GNUPGHOME
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw -s settings.xml -Pci,central,release \
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-vault" ./mvnw -s settings.xml -Pci,central,release \
-Dgpg.passphrase=${PASSPHRASE} \
-Dgpg.secretKeyring=${GNUPGHOME}/secring.gpg \
-DstagingDescription="Releasing Spring Vault" \
clean deploy -U -B
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw -s settings.xml -Pdistribute \
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-vault" ./mvnw -s settings.xml -Pdistribute \
-Dartifactory.server=https://repo.spring.io \
-Dartifactory.username=${ARTIFACTORY_USR} \
-Dartifactory.password=${ARTIFACTORY_PSW} \

2
ci/deploy-snapshot.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash
set -euo pipefail
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw -s settings.xml -Pci,snapshot,artifactory \
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-vault" ./mvnw -s settings.xml -Pci,snapshot,artifactory \
-Dartifactory.server=https://repo.spring.io \
-Dartifactory.username=${ARTIFACTORY_USR} \
-Dartifactory.password=${ARTIFACTORY_PSW} \

2
ci/pipeline.properties
View File

@@ -13,7 +13,7 @@ docker.vault.version=1.11.1
# Docker environment settings
docker.java.inside.basic=-v $HOME:/tmp/vault
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/vault
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
# Credentials

2
ci/version.sh
View File

@@ -2,7 +2,7 @@
set -euo pipefail
RAW_VERSION=`MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw \
RAW_VERSION=`MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-vault" ./mvnw \
org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate \
-Dexpression=project.version -q -DforceStdout`