Run verify before deploy

* Do not add poms as artifact if not deploy
twasa · Jan 27, 2017 · 9dfbfe9 · 9dfbfe9
1 parent 46ef128
commit 9dfbfe9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -21,7 +21,8 @@ stage ('Build') {
                 } finally {
                     archiveArtifacts 'build/libs/*.jar'
                     archiveArtifacts 'build/libs/*.asc'
-                    archiveArtifacts 'build/poms/*.pom'
+                    if (phase == 'deploy') archiveArtifacts 'build/poms/*.xml'
+                    if (phase == 'deploy') archiveArtifacts 'build/poms/*.asc'
                     junit 'build/test-results/test/*.xml'
                 }
         }

diff --git a/build.gradle b/build.gradle
@@ -121,4 +121,4 @@ uploadArchives {
 }
 
 task verify(dependsOn: build)
-task deploy(dependsOn: uploadArchives)
+task deploy(dependsOn: [build, uploadArchives])
diff --git a/src/test/groovy/com/lesfurets/jenkins/TestJenkinsFile.groovy b/src/test/groovy/com/lesfurets/jenkins/TestJenkinsFile.groovy
@@ -29,6 +29,7 @@ class TestJenkinsFile extends BasePipelineTest {
     @Override
     @Before
     void setUp() throws Exception {
+        super.setUp()
         def scmBranch = branch
         binding.setVariable('scm', [
                         $class                           : 'GitSCM',
@@ -43,7 +44,6 @@ class TestJenkinsFile extends BasePipelineTest {
         ])
         helper.registerAllowedMethod("file", [Map.class], stringInterceptor)
         helper.registerAllowedMethod("archiveArtifacts", [String.class], null)
-        super.setUp()
     }
 
     @Test