This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch jenkins-packages-2
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 1fed45ae56190592c36fd654d6faf8e399bd7f3a
Author: Joan Touzet <[email protected]>
AuthorDate: Wed Jul 19 03:42:39 2017 -0400

    Build repos and push to couchdb-vm2
---
 Jenkinsfile | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 88401b8..89738ec 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -421,13 +421,14 @@ pipeline {
           // This image has the deb AND rpm repo tools installed in it
           image 'couchdbdev/debian-8-base'
           // We need the jenkins user mapped inside of the image
-          args '-v /etc/passwd:/etc/passwd -v /etc/group:/etc/group'
+          // We must run as root because we have to create ~/.ssh for rsync
+          args '-v /etc/passwd:/etc/passwd -v /etc/group:/etc/group --user 0:0'
           label 'ubuntu'
         }
       }
       steps {
         withCredentials([file(credentialsId: 'jenkins-key', variable: 'KEY')]) 
{
-          sh 'rm -rf pkgs'
+          sh 'umask 0 && rm -rf pkgs'
           unarchive mapping: ['pkgs/' : '.']
           echo 'Building Debian repo...'
           sh '''
@@ -439,7 +440,7 @@ pipeline {
           echo 'Building CentOS repos...'
           sh '''
             cd pkgs/centos6 && createrepo --database .
-            cd ../centos7 && rm js* && createrepo --database .
+            cd ../centos7 && rm -f js* && createrepo --database .
           '''
           echo 'rsyncing repos to couchdb-vm2...'
           sh '''
@@ -448,16 +449,19 @@ pipeline {
             mv couchdb-pkg/repo/dists $BRANCH_NAME/debian
             mv pkgs/centos6/* $BRANCH_NAME/el6
             mv pkgs/centos7/* $BRANCH_NAME/el7
-            rsync -avz --delete -e "ssh -i $KEY" $BRANCH_NAME 
[email protected]:/var/www/html
+            rsync -avz --delete -e "ssh -o StrictHostKeyChecking=no -i $KEY" 
$BRANCH_NAME [email protected]:/var/www/html
           '''
           // cronjob on couchdb-vm2 cleans up old tarballs (keeps latest 10)
           echo 'rsyncing source tarball to couchdb-vm2...'
+          sh 'rm -rf *.tar.gz'
           unstash 'tarball'
           sh '''
             rm -rf $BRANCH_NAME
             mkdir -p $BRANCH_NAME/source
             mv apache-couchdb-*.tar.gz $BRANCH_NAME/source
-            rsync -avz -e "ssh -i $KEY" $BRANCH_NAME 
[email protected]:/var/www/html
+            rsync -avz -e "ssh -o StrictHostKeyChecking=no -i $KEY" 
$BRANCH_NAME [email protected]:/var/www/html
+            rm -rf $BRANCH_NAME couchdb-pkg *.tar.gz
+            chmod -R a+w * .
           '''
           deleteDir()
         } // withCredentials

-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

Reply via email to