Skip to content

Commit 3f48be0

Browse files
committed
Add -o PubkeyAcceptedKeyTypes=ssh-dss and fix path
1 parent 8337417 commit 3f48be0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

master-bintars/master.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def memory_def():
119119

120120

121121
gccWarningPattern = "^(.*?):([0-9]+):(?:[0-9]+:)? [Ww]arning: (.*)$"
122-
kvm_scpopt = "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
122+
kvm_scpopt = "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PubkeyAcceptedKeyTypes=ssh-dss"
123123

124124

125125
def ScpSourceIntoVM(port):
@@ -190,7 +190,7 @@ def getBintarBuilder(
190190
"rm -Rf buildbot && mkdir buildbot",
191191
ScpSourceIntoVM(port),
192192
util.Interpolate(
193-
"tar -xvzf %(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
193+
"cd buildbot && tar -xvzf %(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1 && rm %(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz"
194194
),
195195
util.Interpolate(
196196
"""

0 commit comments

Comments
 (0)