From fd3c4d1c3d8deffe8e1f1bc87674a0c6ef0c3262 Mon Sep 17 00:00:00 2001
From: psycho <psycho@psychobox.org>
Date: Thu, 13 Aug 2020 15:55:15 +0200
Subject: [PATCH] testing_14

14
---
 Jenkinsfile | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6755c62..a82df3f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,11 @@ def debug = false
 def stageName = ''
 def git_link
 def config_link = 'https://git.psychobox.org/psycho/owrt_build_script.git'
-def config_path = ''
+def config_path = 'configs/'
+def patch_path = 'patches/'
+def script_folder = 'owrt_build_script'
+def git_folder = 'openwrt'
+def patch = '16M.patch'
 
 
 if(params.DEBUG)
@@ -19,6 +23,10 @@ if(params.CFG_PATH)
 {
 	config_path = params.CFG_PATH
 }
+if(params.PATCH)
+{
+	patch = params.PATCH
+}
 
 def printDebug(msg)
 {
@@ -29,26 +37,22 @@ def printDebug(msg)
 
 node('test')
 {
-	if(debug)
-	{
-		printDebug('FFUUCCKK')
-	}
 	
    stageName = 'checkout'
    stage(stageName)
    {
 		cleanWs()
-		sh label: 'checkout_configs', script: 'git clone ' + config_link + ' owrt_build_script'
-		sh label: 'checkout_openwrt', script: 'git clone ' + git_link + ' openwrt'
+		sh label: 'checkout_configs', script: 'git clone ' + config_link + ' ' + config_folder
+		sh label: 'checkout_openwrt', script: 'git clone ' + git_link + ' ' + git_folder
 	}
 	 
 	stageName = 'pre-build'
 	stage(stageName)
 	{
 		sh label: 'uiae', script: 'ls -al'
-		sh label: 'patch_sources', script: 'cd openwrt; patch -p1 < ../owrt_build_script/patches/16M.patch'
-		sh label: 'feeds_update', script: 'cd openwrt; ./scripts/feeds update -a'
-		sh label: 'feeds_install', script: 'cd openwrt; ./scripts/feeds install -a'
+		sh label: 'patch_sources', script: 'cd ' + git_folder + '; patch -p1 < ../' + script_folder + '/' + patch_path + 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'
 		
 	}
     
@@ -57,13 +61,13 @@ node('test')
    {
 		//step
 		//{
-		sh label: 'copy_config', script: 'cp owrt_build_script/configs/tl_wr841_v11_config openwrt/.config'
-		sh label: 'build_v11', script: 'cd openwrt; make oldconfig; make -j13 V=s'
+		sh label: 'copy_config', script: 'cp ' + script_folder + '/' + 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 owrt_build_script/configs/tl_wr841_v12_config openwrt/.config'
-		//sh label: 'build_v12', script: 'cd openwrt; make oldconfig; make -j13'
+		sh label: 'copy_config', script: 'cp ' + script_folder + '/' + config_path + 'tl_wr841_v12_config ' + git_folder + '/.config'
+		sh label: 'build_v12', script: 'cd ' + git_folder + '; make oldconfig; make -j13 V=s'
 		//}
    }