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

Update release tooling for enterprise releases.

Browse Source 
Closes #92
This commit is contained in:
Mark Paluch
2024-07-30 09:42:56 +02:00
parent 600e6dd8a1
commit 5cf398e5e8
6 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Jenkinsfile vendored
View File

@@ -55,6 +55,7 @@ pipeline {
GITHUB_TOKEN = credentials('7b3ebbea-7001-479b-8578-b8c464dab973')
REPO_SPRING_IO = credentials('repo_spring_io-jenkins-release-token')
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
COMMERCIAL = credentials('usw1_packages_broadcom_com-jenkins-token')
STAGING_PROFILE_ID = credentials('spring-data-release-deployment-maven-central-staging-profile-id')
MAVEN_SIGNING_KEY = credentials('spring-gpg-private-key')
MAVEN_SIGNING_KEY_PASSWORD = credentials('spring-gpg-passphrase')

9
smoke-tests/pom.xml
View File

@@ -97,16 +97,17 @@
<id>commercial</id>
<repositories>
<repository>
<id>spring-commercial-release</id>
<id>spring-enterprise-stage</id>
<url>
https://repo.spring.vmware.com/artifactory/spring-commercial/
https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-stage-local/
</url>
</repository>
<repository>
<id>spring-commercial-staging</id>
<id>spring-enterprise-release</id>
<url>
https://repo.spring.vmware.com/artifactory/spring-commercial-staging-local/
https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-prod-local/
</url>
</repository>
</repositories>

14
smoke-tests/settings.xml
View File

@@ -16,8 +16,18 @@
</server>
<server>
<id>spring-libs-milestone</id>
<username>${ARTIFACTORY_USR}</username>
<password>${ARTIFACTORY_PSW}</password>
<username>${env.ARTIFACTORY_USR}</username>
<password>${env.ARTIFACTORY_PSW}</password>
</server>
<server>
<id>spring-enterprise-stage</id>
<username>${env.COMMERCIAL_USR}</username>
<password>${env.COMMERCIAL_PSW}</password>
</server>
<server>
<id>spring-enterprise-release</id>
<username>${env.COMMERCIAL_USR}</username>
<password>${env.COMMERCIAL_PSW}</password>
</server>
</servers>

5
src/main/java/org/springframework/data/release/build/UpdateInformation.java
View File

@@ -102,12 +102,11 @@ public class UpdateInformation {
if (phase == Phase.CLEANUP || phase == Phase.MAINTENANCE) {
return train.isCommercial()
? Arrays.asList(Repository.COMMERCIAL_SNAPSHOT, Repository.COMMERCIAL_RELEASE)
return train.isCommercial() ? Arrays.asList(Repository.COMMERCIAL_SNAPSHOT, Repository.COMMERCIAL_RELEASE)
: Arrays.asList(Repository.SNAPSHOT, Repository.MILESTONE);
}
return train.isCommercial() ? Arrays.asList(Repository.COMMERCIAL_RELEASE) : Collections.emptyList();
return Collections.emptyList();
}
/**

10
src/main/resources/application.properties
View File

@@ -29,11 +29,11 @@ deployment.opensource.distribution-repository=temp-private-local
# deployment.commercial.api-key <- local, for promotion
# Prod
deployment.commercial.server.uri=https://repo.spring.vmware.com
deployment.commercial.server.verification-resource=spring-commercial-staging-local
deployment.commercial.staging-repository=spring-commercial-staging-local
deployment.commercial.target-repository=spring-commercial-release-local
deployment.commercial.distribution-repository=spring-commercial-release-local
deployment.commercial.server.uri=https://usw1.packages.broadcom.com
deployment.commercial.server.verification-resource=spring-enterprise-maven-stage-local
deployment.commercial.staging-repository=spring-enterprise-maven-stage-local
deployment.commercial.target-repository=spring-enterprise-maven-prod-local
deployment.commercial.distribution-repository=spring-enterprise-maven-prod-local
deployment.commercial.project=spring
# deployment.commercial.distribution-repository=
# deployment.commercial.username <- local, for build

4
src/test/java/org/springframework/data/release/build/UpdateInformationUnitTests.java
View File

@@ -70,6 +70,10 @@ class UpdateInformationUnitTests {
Phase.PREPARE);
assertThat(updateInformation.getRepositories()).isEmpty();
updateInformation = UpdateInformation.of(new TrainIteration(ReleaseTrains.TURING, Iteration.GA), Phase.PREPARE);
assertThat(updateInformation.getRepositories()).isEmpty();
}
@Test