DATAMONGO-2280 - Use parent 'artifactory' profile for snapshot releases.

gregturn · gregturn · commit c0a22667b976 · 2019-07-03T17:10:56.000-05:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -8,6 +8,7 @@ pipeline {
 
     options {
         disableConcurrentBuilds()
+        buildDiscarder(logRotator(numToKeepStr: '14'))
     }
 
     stages {
@@ -17,7 +18,7 @@ pipeline {
                     when {
                         changeset "ci/openjdk8-mongodb-4.0/**"
                     }
-                    agent any
+                    agent { label 'data' }
                     options { timeout(time: 30, unit: 'MINUTES') }
 
                     steps {
@@ -33,7 +34,7 @@ pipeline {
                     when {
                         changeset "ci/openjdk8-mongodb-4.1/**"
                     }
-                    agent any
+                    agent { label 'data' }
                     options { timeout(time: 30, unit: 'MINUTES') }
 
                     steps {
@@ -58,7 +59,8 @@ pipeline {
             agent {
                 docker {
                     image 'springci/spring-data-openjdk8-with-mongodb-4.0:latest'
-                    args '-v $HOME/.m2:/tmp/spring-data-maven-repository'
+                    label 'data'
+                    args '-v $HOME:/tmp/jenkins-home'
                 }
             }
             options { timeout(time: 30, unit: 'MINUTES') }
@@ -69,7 +71,7 @@ pipeline {
                 sh 'sleep 10'
                 sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
                 sh 'sleep 15'
-                sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw clean dependency:list test -Dsort -B'
+                sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -B'
             }
         }
 
@@ -84,9 +86,9 @@ pipeline {
                 stage("test: mongodb 4.1") {
                     agent {
                         docker {
-                            label 'data'
                             image 'springci/spring-data-openjdk8-with-mongodb-4.1:latest'
-                            args '-v $HOME/.m2:/tmp/spring-data-maven-repository'
+                            label 'data'
+                            args '-v $HOME:/tmp/jenkins-home'
                         }
                     }
                     options { timeout(time: 30, unit: 'MINUTES') }
@@ -97,7 +99,7 @@ pipeline {
                         sh 'sleep 10'
                         sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
                         sh 'sleep 15'
-                        sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw clean dependency:list test -Dsort -B'
+                        sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -B'
                     }
                 }
             }
@@ -111,7 +113,8 @@ pipeline {
             agent {
                 docker {
                     image 'adoptopenjdk/openjdk8:latest'
-                    args '-v $HOME/.m2:/tmp/spring-data-maven-repository'
+                    label 'data'
+                    args '-v $HOME:/tmp/jenkins-home'
                 }
             }
             options { timeout(time: 20, unit: 'MINUTES') }
@@ -122,7 +125,14 @@ pipeline {
 
             steps {
                 sh 'rm -rf ?'
-                sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B'
+                sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -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-mongodb " +
+                        "-Dartifactory.build-number=${BUILD_NUMBER} " +
+                        '-Dmaven.test.skip=true clean deploy -B'
             }
         }
 
@@ -133,7 +143,8 @@ pipeline {
             agent {
                 docker {
                     image 'adoptopenjdk/openjdk8:latest'
-                    args '-v $HOME/.m2:/tmp/spring-data-maven-repository'
+                    label 'data'
+                    args '-v $HOME:/tmp/jenkins-home'
                 }
             }
             options { timeout(time: 20, unit: 'MINUTES') }
@@ -144,7 +155,14 @@ pipeline {
 
             steps {
                 sh 'rm -rf ?'
-                sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B'
+                sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -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-mongodb " +
+                        "-Dartifactory.build-number=${BUILD_NUMBER} " +
+                        '-Dmaven.test.skip=true clean deploy -B'
             }
         }
     }
diff --git a/pom.xml b/pom.xml
@@ -114,46 +114,6 @@
 
 	<profiles>
 
-		<profile>
-			<id>snapshot</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.jfrog.buildinfo</groupId>
-						<artifactId>artifactory-maven-plugin</artifactId>
-						<version>2.6.1</version>
-						<inherited>false</inherited>
-						<executions>
-							<execution>
-								<id>build-info</id>
-								<goals>
-									<goal>publish</goal>
-								</goals>
-								<configuration>
-									<buildInfo>
-										<buildUrl>{{BUILD_URL}}</buildUrl>
-									</buildInfo>
-									<deployProperties>
-										<zip.name>spring-data-mongodb</zip.name>
-										<zip.displayname>spring-data-mongodb</zip.displayname>
-										<zip.deployed>false</zip.deployed>
-										<archives>*:*:*:*@zip</archives>
-									</deployProperties>
-									<publisher>
-										<contextUrl>https://repo.spring.io</contextUrl>
-										<username>{{ARTIFACTORY_USR}}</username>
-										<password>{{ARTIFACTORY_PSW}}</password>
-										<repoKey>libs-snapshot-local</repoKey>
-										<snapshotRepoKey>libs-snapshot-local</snapshotRepoKey>
-									</publisher>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
 		<profile>
 			<id>release</id>
 			<build>

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ pipeline {`
`8`	`8`
`9`	`9`	`options {`
`10`	`10`	`disableConcurrentBuilds()`
	`11`	`+ buildDiscarder(logRotator(numToKeepStr: '14'))`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`stages {`
`@@ -17,7 +18,7 @@ pipeline {`
`17`	`18`	`when {`
`18`	`19`	`changeset "ci/openjdk8-mongodb-4.0/**"`
`19`	`20`	`}`
`20`		`- agent any`
	`21`	`+ agent { label 'data' }`
`21`	`22`	`options { timeout(time: 30, unit: 'MINUTES') }`
`22`	`23`
`23`	`24`	`steps {`
`@@ -33,7 +34,7 @@ pipeline {`
`33`	`34`	`when {`
`34`	`35`	`changeset "ci/openjdk8-mongodb-4.1/**"`
`35`	`36`	`}`
`36`		`- agent any`
	`37`	`+ agent { label 'data' }`
`37`	`38`	`options { timeout(time: 30, unit: 'MINUTES') }`
`38`	`39`
`39`	`40`	`steps {`
`@@ -58,7 +59,8 @@ pipeline {`
`58`	`59`	`agent {`
`59`	`60`	`docker {`
`60`	`61`	`image 'springci/spring-data-openjdk8-with-mongodb-4.0:latest'`
`61`		`- args '-v $HOME/.m2:/tmp/spring-data-maven-repository'`
	`62`	`+ label 'data'`
	`63`	`+ args '-v $HOME:/tmp/jenkins-home'`
`62`	`64`	`}`
`63`	`65`	`}`
`64`	`66`	`options { timeout(time: 30, unit: 'MINUTES') }`
`@@ -69,7 +71,7 @@ pipeline {`
`69`	`71`	`sh 'sleep 10'`
`70`	`72`	`sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'`
`71`	`73`	`sh 'sleep 15'`
`72`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw clean dependency:list test -Dsort -B'`
	`74`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -B'`
`73`	`75`	`}`
`74`	`76`	`}`
`75`	`77`
`@@ -84,9 +86,9 @@ pipeline {`
`84`	`86`	`stage("test: mongodb 4.1") {`
`85`	`87`	`agent {`
`86`	`88`	`docker {`
`87`		`- label 'data'`
`88`	`89`	`image 'springci/spring-data-openjdk8-with-mongodb-4.1:latest'`
`89`		`- args '-v $HOME/.m2:/tmp/spring-data-maven-repository'`
	`90`	`+ label 'data'`
	`91`	`+ args '-v $HOME:/tmp/jenkins-home'`
`90`	`92`	`}`
`91`	`93`	`}`
`92`	`94`	`options { timeout(time: 30, unit: 'MINUTES') }`
`@@ -97,7 +99,7 @@ pipeline {`
`97`	`99`	`sh 'sleep 10'`
`98`	`100`	`sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'`
`99`	`101`	`sh 'sleep 15'`
`100`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw clean dependency:list test -Dsort -B'`
	`102`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -B'`
`101`	`103`	`}`
`102`	`104`	`}`
`103`	`105`	`}`
`@@ -111,7 +113,8 @@ pipeline {`
`111`	`113`	`agent {`
`112`	`114`	`docker {`
`113`	`115`	`image 'adoptopenjdk/openjdk8:latest'`
`114`		`- args '-v $HOME/.m2:/tmp/spring-data-maven-repository'`
	`116`	`+ label 'data'`
	`117`	`+ args '-v $HOME:/tmp/jenkins-home'`
`115`	`118`	`}`
`116`	`119`	`}`
`117`	`120`	`options { timeout(time: 20, unit: 'MINUTES') }`
`@@ -122,7 +125,14 @@ pipeline {`
`122`	`125`
`123`	`126`	`steps {`
`124`	`127`	`sh 'rm -rf ?'`
`125`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B'`
	`128`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +`
	`129`	`+ '-Dartifactory.server=https://repo.spring.io ' +`
	`130`	`+ "-Dartifactory.username=${ARTIFACTORY_USR} " +`
	`131`	`+ "-Dartifactory.password=${ARTIFACTORY_PSW} " +`
	`132`	`+ "-Dartifactory.staging-repository=libs-snapshot-local " +`
	`133`	`+ "-Dartifactory.build-name=spring-data-mongodb " +`
	`134`	`+ "-Dartifactory.build-number=${BUILD_NUMBER} " +`
	`135`	`+ '-Dmaven.test.skip=true clean deploy -B'`
`126`	`136`	`}`
`127`	`137`	`}`
`128`	`138`
`@@ -133,7 +143,8 @@ pipeline {`
`133`	`143`	`agent {`
`134`	`144`	`docker {`
`135`	`145`	`image 'adoptopenjdk/openjdk8:latest'`
`136`		`- args '-v $HOME/.m2:/tmp/spring-data-maven-repository'`
	`146`	`+ label 'data'`
	`147`	`+ args '-v $HOME:/tmp/jenkins-home'`
`137`	`148`	`}`
`138`	`149`	`}`
`139`	`150`	`options { timeout(time: 20, unit: 'MINUTES') }`
`@@ -144,7 +155,14 @@ pipeline {`
`144`	`155`
`145`	`156`	`steps {`
`146`	`157`	`sh 'rm -rf ?'`
`147`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/spring-data-maven-repository" ./mvnw -Pci,snapshot -Dmaven.test.skip=true clean deploy -B'`
	`158`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +`
	`159`	`+ '-Dartifactory.server=https://repo.spring.io ' +`
	`160`	`+ "-Dartifactory.username=${ARTIFACTORY_USR} " +`
	`161`	`+ "-Dartifactory.password=${ARTIFACTORY_PSW} " +`
	`162`	`+ "-Dartifactory.staging-repository=libs-snapshot-local " +`
	`163`	`+ "-Dartifactory.build-name=spring-data-mongodb " +`
	`164`	`+ "-Dartifactory.build-number=${BUILD_NUMBER} " +`
	`165`	`+ '-Dmaven.test.skip=true clean deploy -B'`
`148`	`166`	`}`
`149`	`167`	`}`
`150`	`168`	`}`