[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [websites/build-kde-org/sok-work] config/build: Fix linux override ssh createRemotePathCommand for l
From:       Scarlett Clark <sgclark () kubuntu ! org>
Date:       2014-12-04 19:46:48
Message-ID: E1XwcMS-0000sQ-Pr () scm ! kde ! org
[Download RAW message or body]

Git commit fa4fe14ad988a748a0e86df983689760ff73c687 by Scarlett Clark.
Committed on 04/12/2014 at 19:43.
Pushed by scarlettclark into branch 'sok-work'.

Fix linux override ssh createRemotePathCommand for localsetup
Repeat ^ for windows rsync to use plink

M  +1    -1    config/build/linux64-g++.cfg
M  +1    -1    config/build/windows-mingw-w32.cfg

http://commits.kde.org/websites/build-kde-org/fa4fe14ad988a748a0e86df983689760ff73c687


diff --git a/config/build/linux64-g++.cfg b/config/build/linux64-g++.cfg
index d9a674c..e7f0817 100644
--- a/config/build/linux64-g++.cfg
+++ b/config/build/linux64-g++.cfg
@@ -6,7 +6,7 @@ compiler=g++
 [General]
 remoteHostPrefix=jenkins@10.0.0.2:%(remotePrefix)s
 rsyncCommand=%(rsyncExecutable)s --delete-during -rlptgoDavz -e "ssh"
-createRemotePathCommand=%(sshExecutable)s -v -x -i -p 2222 \
/var/lib/jenkins-slave/\.ssh/id_rsa jenkins@10.0.0.2 mkdir -p {remotePath} \
+createRemotePathCommand=%(sshExecutable)s -v -x -i -p 2222 \
/var/lib/jenkins-slave/\.ssh/id_rsa_jenkins jenkins@10.0.0.2 mkdir -p {remotePath}  
 [DependencyInformation]
 remoteHostPrefix=jenkins@10.0.0.2:%(remotePrefix)s
diff --git a/config/build/windows-mingw-w32.cfg b/config/build/windows-mingw-w32.cfg
index 0a12ed2..3d1a8f0 100644
--- a/config/build/windows-mingw-w32.cfg
+++ b/config/build/windows-mingw-w32.cfg
@@ -10,7 +10,7 @@ sshExecutable=plink
 [General]
 installPrefix=C:\Jenkins\install\%(opSys)s\%(architecture)s\%(compiler)s\
 remoteHostPrefix=jenkins@10.0.0.2:%(remotePrefix)s
-rsyncCommand=%(rsyncExecutable)s --delete-during -rlptgoDavz -e "ssh"
+rsyncCommand=%(rsyncExecutable)s --delete-during -rlptgoDavz -e "plink"
 createRemotePathCommand=%(sshExecutable)s -v -x -P 2222 -i C:\Jenkins\id_rsa.ppk \
jenkins@10.0.0.2 mkdir -p {remotePath}  
 [DependencyInformation]


[prev in list] [next in list] [prev in thread] [next in thread]