From 3593cc95fdaff8911f907ccd02015a3edae76614 Mon Sep 17 00:00:00 2001
From: psycho <psycho@psychobox.org>
Date: Thu, 13 Aug 2020 16:15:21 +0200
Subject: [PATCH] testing_17

17
---
 Jenkinsfile | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f67f524..9b1ef16 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,12 +3,12 @@
 def debug = false
 def stageName = ''
 def git_link
-def config_link = 'https://git.psychobox.org/psycho/owrt_build_script.git'
-def config_path = 'configs/'
-def patch_path = 'patches/'
-def script_folder = 'owrt_build_script'
+def script_git = 'https://git.psychobox.org/psycho/owrt_build_script.git'
 def git_folder = 'openwrt'
-def patch = '16M.patch'
+def script_folder = 'owrt_build_script'
+def config_path = script_folder + '/configs/'
+def patch_path = script_folder + '/patches/'
+def patch = patch_path + '16M.patch'
 
 
 if(params.DEBUG)
@@ -19,14 +19,6 @@ if(params.GIT)
 {
 	git_link = params.GIT
 }
-if(params.CFG_PATH)
-{
-	config_path = params.CFG_PATH
-}
-if(params.PATCH)
-{
-	patch = params.PATCH
-}
 
 def printDebug(msg)
 {
@@ -42,7 +34,7 @@ node('test')
    stage(stageName)
    {
 		cleanWs()
-		sh label: 'checkout_configs', script: 'git clone ' + config_link + ' ' + script_folder
+		sh label: 'checkout_configs', script: 'git clone ' + script_git + ' ' + script_folder
 		sh label: 'checkout_openwrt', script: 'git clone ' + git_link + ' ' + git_folder
 	}
 	 
@@ -50,7 +42,7 @@ node('test')
 	stage(stageName)
 	{
 		sh label: 'uiae', script: 'ls -al'
-		sh label: 'patch_sources', script: 'cd ' + git_folder + '; patch -p1 < ../' + script_folder + '/' + patch_path + patch
+		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'
 		
@@ -61,12 +53,12 @@ node('test')
    {
 		//step
 		//{
-		sh label: 'copy_config', script: 'cp ' + script_folder + '/' + config_path + 'tl_wr841_v11_config ' + git_folder + '/.config'
+		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 ' + script_folder + '/' + config_path + 'tl_wr841_v12_config ' + git_folder + '/.config'
+		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'
 		//}
    }