Use milestones and locks to restrict concurrency of pushing to the do…

…cker tag
cyverse-de · Oct 13, 2016 · 6a92328 · 6a92328
1 parent 68c6803
commit 6a92328
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -31,18 +31,22 @@ node('docker') {
                 sh "docker run --rm --name ${dockerTestCleanup} -v \$(pwd):/build -w /build alpine rm -r test2junit"
             }
 
+            milestone 100
             stage "Docker Push"
             dockerPushRepo = "${service.dockerUser}/${service.repo}:${env.BRANCH_NAME}"
-            sh "docker tag ${dockerRepo} ${dockerPushRepo}"
-            withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'jenkins-docker-credentials', passwordVariable: 'DOCKER_PASSWORD', usernameVariable: 'DOCKER_USERNAME']]) {
-                sh """docker run -e DOCKER_USERNAME -e DOCKER_PASSWORD \\
-                                 -v /var/run/docker.sock:/var/run/docker.sock \\
-                                 --rm --name ${dockerPusher} \\
-                                 docker:\$(docker version --format '{{ .Server.Version }}') \\
-                                 sh -e -c \\
-                      'docker login -u \"\$DOCKER_USERNAME\" -p \"\$DOCKER_PASSWORD\" && \\
-                       docker push ${dockerPushRepo} && \\
-                       docker logout'"""
+            lock("docker-push-${dockerPushRepo}") {
+              milestone 101
+              sh "docker tag ${dockerRepo} ${dockerPushRepo}"
+              withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'jenkins-docker-credentials', passwordVariable: 'DOCKER_PASSWORD', usernameVariable: 'DOCKER_USERNAME']]) {
+                  sh """docker run -e DOCKER_USERNAME -e DOCKER_PASSWORD \\
+                                   -v /var/run/docker.sock:/var/run/docker.sock \\
+                                   --rm --name ${dockerPusher} \\
+                                   docker:\$(docker version --format '{{ .Server.Version }}') \\
+                                   sh -e -c \\
+                        'docker login -u \"\$DOCKER_USERNAME\" -p \"\$DOCKER_PASSWORD\" && \\
+                         docker push ${dockerPushRepo} && \\
+                         docker logout'"""
+              }
             }
         } finally {
             sh returnStatus: true, script: "docker kill ${dockerTestRunner}"