Jenkins fixes

2020-01-16 15:17:57 +01:00 · 2020-01-16 15:17:57 +01:00 · 3631ac59ad
parent 66f07e1241
commit 3631ac59ad
1 changed files with 10 additions and 9 deletions
--- a/19
+++ b/19
@ -23,20 +23,21 @@ pipeline {
                sh 'printenv'
            }
        }
-        stage('Build') {
-            when {
-                branch 'master'
-            }
-            steps {
-                sh 'docker run --rm -v jenkins_master:$JENKINS_HOME $IMAGE vn-debuild "$WORKSPACE"'
-            }
-        }
        stage('Deploy') {
            when {
                branch 'master'
            }
+            agent {
+                docker {
+                    image 'registry.verdnatura.es/vn-debuild'
+                    registryUrl 'https://registry.verdnatura.es/'
+                    registryCredentialsId 'docker-registry'
+                    args '-v jenkins_master:"$JENKINS_HOME" -v /mnt/storage/reprepro:/reprepro'
+                }
+            }
            steps {
-                sh 'docker run --rm -v jenkins_master:$JENKINS_HOME -v /mnt/storage/reprepro:/reprepro $IMAGE vn-include "$WORKSPACE"'
+                sh 'vn-debuild "$WORKSPACE"'
+                sh 'vn-include "$WORKSPACE"'
            }
        }
    }