diff --git a/Jenkinsfile b/Jenkinsfile index 2b53bf4..bf70f57 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -80,7 +80,6 @@ node('test') { //currentbuild.result = 'SUCCESS' - /* stage('checkout') { if(pre_clean) @@ -96,34 +95,36 @@ node('test') } } - stage('pre-build') + if(isBuildNeeded) { - 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' - + 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' + + } + + stage('build') + { + //step + //{ + sh label: 'copy_config', script: 'cp ' + config_path + 'tl_wr841_v11_config ' + git_folder + '/.config' + sh label: 'build_v11', script: 'cd ' + git_folder + '; make oldconfig; make -j13 V=s' + //} + //step + //{ + sh label: 'copy_config', script: 'cp ' + config_path + 'tl_wr841_v12_config ' + git_folder + '/.config' + sh label: 'build_v12', script: 'cd ' + git_folder + '; make oldconfig; make -j13 V=s' + //} + } + + + 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 + } } - - stage('build') - { - //step - //{ - sh label: 'copy_config', script: 'cp ' + config_path + 'tl_wr841_v11_config ' + git_folder + '/.config' - sh label: 'build_v11', script: 'cd ' + git_folder + '; make oldconfig; make -j13 V=s' - //} - //step - //{ - sh label: 'copy_config', script: 'cp ' + config_path + 'tl_wr841_v12_config ' + git_folder + '/.config' - sh label: 'build_v12', script: 'cd ' + git_folder + '; make oldconfig; make -j13 V=s' - //} - } - */ - - 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 - } - if(post_clean) @@ -144,7 +145,7 @@ node('test') //logger.printInfo('job is getting deleted ' + currentBuild.id.toString())//job.nextBuildNumber) job.nextBuildNumber -= 1 //updateNextBuildNumber(job.getNextBuildNumber() - 1) //resetting next build number does not work. if done, the next build start will do nothing //job.saveNextBuildNumber() - //job.updateNextBuildNumber(job.nextBuildNumber - 1) + job.updateNextBuildNumber(job.nextBuildNumber - 1) printDebug('NUMBER_after:' + job.nextBuildNumber) job.getLastBuild().delete() job.save()