Fix rsync issue for sdk rootstrap 55/166255/1
authorhyokeun <hyokeun.jeon@samsung.com>
Tue, 9 Jan 2018 04:19:25 +0000 (13:19 +0900)
committerhyokeun <hyokeun.jeon@samsung.com>
Tue, 9 Jan 2018 04:19:25 +0000 (13:19 +0900)
Change-Id: I1d5f5ae44dc5cc8481602b49ba3eba452db56f9c

job_create_sdkrootstrap.py

index cf7bda1..f01a8f2 100755 (executable)
@@ -168,7 +168,7 @@ def sync_to_download(src, dst, log_src):
     """
     Run Sync download server
     """
-    rsync_cmd = 'rsync -avr %s/ %s' % (src, dst)
+    rsync_cmd = 'rsync -avr %s/* %s/' % (src, dst)
     print 'rsync_cmd = %s' % (rsync_cmd)
     proc = subprocess.Popen(rsync_cmd,shell=True,stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     out, err = proc.communicate()
@@ -250,7 +250,7 @@ def make_rs_snapshot_private(git_prj, git_cache, mygit, fields, profile, vm_imag
     git_cmd = 'git clone ssh://%s:%s/%s -b %s' % ( git_host, git_port, git_prj, git_branch)
     print 'git_cmd %s' %(git_cmd)
 
-    buildcmd = '#!/bin/bash \n' \
+    buildcmd = '#!/bin/bash \nset -x\n' \
                'BUILDDIR="/share/build"\nWORKDIR="/srv/work"\nRS="rbs_out"\nSDKIMAGE="sdk-image"\n' \
                'chown -R build:build $BUILDDIR\nchmod 600 $BUILDDIR/.ssh/id_rsa \n' \
                'cp -r "$BUILDDIR/.ssh/" /root/\nchmod 600 /root/.ssh/id_rsa\n' \