Merge pull request jenkinsci#91 from slide/master

Don't build on trusted and image cleanup
alauda · Oct 10, 2019 · d36dde0 · d36dde0
2 parents 1dbaeef + bf46af6
commit d36dde0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -34,6 +34,8 @@ pipeline {
                             infra.withDockerCredentials {
                                 powershell '& ./make.ps1 publish'
                             }
+
+                            powershell '& docker system prune --force --all'
                         }
                     }
                 }
@@ -45,7 +47,11 @@ pipeline {
                         timeout(time: 30, unit: 'MINUTES')
                     }
                     steps {
-                        sh './build.sh'
+                        script {
+                            if(!infra.isTrusted()) {
+                                sh './build.sh ; docker system prune --force --all'
+                            }
+                        }
                     }
                 }
             }

diff --git a/make.ps1 b/make.ps1
@@ -58,6 +58,4 @@ if($lastExitCode -ne 0) {
 } else {
     Write-Host "Build finished successfully"
 }
-Write-Host "Cleaning up docker images..."
-& docker system prune --force --all
 exit $lastExitCode