diff --git a/Jenkinsfile b/Jenkinsfile index 3e124d2..06873d3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -84,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 ' + params.SFTP_PASSWD + ' -g ' + git_folder + ' -f ' + scripts_path + known_hosts + ' -l ' + sftp_path, returnStdout: true + def ret = sh label: 'is_build_needed', script: 'set +x; 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 + '; set -x', returnStdout: true if(ret.trim().equalsIgnoreCase('True')) { isBuildNeeded = true @@ -96,15 +96,14 @@ node('test') stage('pre-build') { sh label: 'patch_sources', script: 'cd ' + git_folder + '; patch -p1 < ../' + patch - sh label: 'feeds_update', script: 'cd ' + git_folder + '; ./scripts/feeds update -a' - sh label: 'feeds_install', script: 'cd ' + git_folder + '; ./scripts/feeds install -a' - + //sh label: 'feeds_update', script: 'cd ' + git_folder + '; ./scripts/feeds update -a' + //sh label: 'feeds_install', script: 'cd ' + git_folder + '; ./scripts/feeds install -a' } stage('build') { sh label: 'copy_config', script: 'cp ' + config_path + 'tl_wr841_config ' + git_folder + '/.config' - sh label: 'build_v11', script: 'cd ' + git_folder + '; make defconfig; make -j$((`nproc` + 1))' + sh label: 'build', script: 'cd ' + git_folder + '; make defconfig; make download; make -j$((`nproc` + 1))' }