diff --git a/Jenkinsfile b/Jenkinsfile index 2177fb3..7efeb4a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ def scripts_path = script_folder + '/scripts/' def patch = patch_path + '16M.patch' def sftp_host = '' def sftp_user = '' -def sftp_passwd = '' +//def sftp_passwd = '' def sftp_path = '/jenkins/owrt/' def isBuildNeeded = false def deleteUnbuild = true @@ -37,10 +37,6 @@ if(params.SFTP_USER) { sftp_user = params.SFTP_USER } -if(params.SFTP_PASSWD) -{ - sftp_passwd = params.SFTP_PASSWD -} if(params.SFTP_PATH) { sftp_path = params.SFTP_PATH @@ -88,7 +84,7 @@ node('test') } sh label: 'checkout_configs', script: 'git clone ' + script_git + ' ' + script_folder sh label: 'checkout_openwrt', script: 'git clone ' + git_link + ' ' + git_folder - def ret = sh label: 'is_build_needed', script: 'python ' + scripts_path + 'sftp_test.py -a ' + sftp_host + ' -u ' + sftp_user + ' -p ' + sftp_passwd + ' -g ' + git_folder + ' -f ' + scripts_path + known_hosts + ' -l ' + sftp_path, returnStdout: true + def ret = sh label: 'is_build_needed', script: 'python ' + scripts_path + 'sftp_test.py -a ' + sftp_host + ' -u ' + sftp_user + ' -p ' + params.SFTP_PASSWD + ' -g ' + git_folder + ' -f ' + scripts_path + known_hosts + ' -l ' + sftp_path, returnStdout: true if(ret.trim().equalsIgnoreCase('True')) { isBuildNeeded = true @@ -122,7 +118,7 @@ node('test') stage('move_bin_to_ftp') { - sh label: 'copy_binaries', script: 'python ' + scripts_path + 'sftp_test.py -a ' + sftp_host + ' -u ' + sftp_user + ' -p ' + sftp_passwd + ' -g ' + git_folder + ' -f ' + scripts_path + known_hosts + ' -l ' + sftp_path + ' -c ' + bin_path + sh label: 'copy_binaries', script: 'python ' + scripts_path + 'sftp_test.py -a ' + sftp_host + ' -u ' + sftp_user + ' -p ' + params.SFTP_PASSWD + ' -g ' + git_folder + ' -f ' + scripts_path + known_hosts + ' -l ' + sftp_path + ' -c ' + bin_path } }