psycho/owrt_build_script
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

testing_50

Browse Source 
50
This commit is contained in:
psycho 2020-08-14 20:42:22 +02:00
parent 606b3b3e1a
commit 8ef99c33c7
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Jenkinsfile vendored
View File

@ -12,7 +12,7 @@ def scripts_path = script_folder + '/scripts/'
def patch = patch_path + '16M.patch' def patch = patch_path + '16M.patch'
def sftp_host = '' def sftp_host = ''
def sftp_user = '' def sftp_user = ''
def sftp_passwd = '' //def sftp_passwd = ''
def sftp_path = '/jenkins/owrt/' def sftp_path = '/jenkins/owrt/'
def isBuildNeeded = false def isBuildNeeded = false
def deleteUnbuild = true def deleteUnbuild = true
@ -37,10 +37,6 @@ if(params.SFTP_USER)
{ {
sftp_user = params.SFTP_USER sftp_user = params.SFTP_USER
} }
if(params.SFTP_PASSWD)
{
sftp_passwd = params.SFTP_PASSWD
}
if(params.SFTP_PATH) if(params.SFTP_PATH)
{ {
sftp_path = 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_configs', script: 'git clone ' + script_git + ' ' + script_folder
sh label: 'checkout_openwrt', script: 'git clone ' + git_link + ' ' + git_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')) if(ret.trim().equalsIgnoreCase('True'))
{ {
isBuildNeeded = true isBuildNeeded = true
@ -122,7 +118,7 @@ node('test')
stage('move_bin_to_ftp') 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
} }
} }