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

Update CI infrastructure paths.

Browse Source
This commit is contained in:
Mark Paluch
2025-04-25 15:10:24 +02:00
parent 3ca17ec7ca
commit 0534a0123d
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@@ -63,7 +63,7 @@ pipeline {
docker.image("${p['docker.image']}").inside(p['docker.java.inside.basic']) {
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/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
}
}
}

4
ci/deploy-milestone.sh
View File

@@ -2,7 +2,7 @@
set -euo pipefail
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,milestone,artifactory,release \
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/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/jenkins-home" ./mvnw -s setting
-Dartifactory.build-number=${BUILD_NUMBER} \
clean deploy -U -B
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pdistribute \
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/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/jenkins-home" ./mvnw -s settings.xml -Pci,central,release \
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/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/jenkins-home" ./mvnw -s settings.xml -Pdistribute \
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/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/jenkins-home" ./mvnw -s settings.xml -Pci,snapshot,artifactory \
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw -s settings.xml -Pci,snapshot,artifactory \
-Dartifactory.server=https://repo.spring.io \
-Dartifactory.username=${ARTIFACTORY_USR} \
-Dartifactory.password=${ARTIFACTORY_PSW} \

4
ci/pipeline.properties
View File

@@ -12,8 +12,8 @@ docker.image=${docker.build.image.name}
docker.vault.version=1.11.1
# 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.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
# 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/jenkins-home" ./mvnw \
RAW_VERSION=`MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/vault" ./mvnw \
org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate \
-Dexpression=project.version -q -DforceStdout`