From 0c24651319d010929d2082e1954576e269d0439d Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 18 May 2022 14:46:30 +0800 Subject: [PATCH 1/5] enh: add windows build test to ci --- Jenkinsfile2 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index cbf663cdcf..bc2c9ff494 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -226,6 +226,13 @@ pipeline { stages { stage('run test') { parallel { + stage('windows test') { + agent{label " windows10_01 || windows10_02 || windows10_03 || windows10_04 "} + steps { + pre_test_win() + pre_test_build_win() + } + } stage('linux test') { agent{label " slave3_0 || slave15 || slave16 || slave17 "} options { skipDefaultCheckout() } From f4ef09bf6b8c164a23df529acf15f2c9f768e76c Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 18 May 2022 15:11:54 +0800 Subject: [PATCH 2/5] enh: print ip address before build --- Jenkinsfile2 | 52 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index bc2c9ff494..20a86dbcea 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -117,27 +117,29 @@ def pre_test(){ def pre_test_win(){ bat ''' hostname + ipconfig + set date /t time /t - taskkill /f /t /im python.exe - taskkill /f /t /im bash.exe rd /s /Q C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\debug - exit 0 ''' bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal git reset --hard git fetch || git fetch + ''' + bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community git reset --hard git fetch || git fetch - git checkout -f ''' script { if (env.CHANGE_TARGET == 'master') { bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal git checkout master + ''' + bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community git checkout master ''' @@ -145,6 +147,8 @@ def pre_test_win(){ bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal git checkout 2.0 + ''' + bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community git checkout 2.0 ''' @@ -152,6 +156,8 @@ def pre_test_win(){ bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal git checkout 3.0 + ''' + bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community git checkout 3.0 ''' @@ -159,6 +165,8 @@ def pre_test_win(){ bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal git checkout develop + ''' + bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community git checkout develop ''' @@ -169,30 +177,50 @@ def pre_test_win(){ bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal git pull - git log -5 + ''' + bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community git pull - git fetch origin +refs/pull/${CHANGE_ID}/merge + ''' + bat ''' + cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community + git fetch origin +refs/pull/%CHANGE_ID%/merge + ''' + bat ''' + cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community git checkout -qf FETCH_HEAD - git log -5 ''' } else if (env.CHANGE_URL =~ /\/TDinternal\//) { bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal git pull - git fetch origin +refs/pull/${CHANGE_ID}/merge + ''' + bat ''' + cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal + git fetch origin +refs/pull/%CHANGE_ID%/merge + ''' + bat ''' + cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal git checkout -qf FETCH_HEAD - git log -5 + ''' + bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community git pull - git log -5 ''' } else { - sh ''' - echo "unmatched reposiotry ${CHANGE_URL}" + bat ''' + echo "unmatched reposiotry %CHANGE_URL%" ''' } } + bat ''' + cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal + git log -5 + ''' + bat ''' + cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community + git log -5 + ''' bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community git submodule update --init --recursive From 5fdf57a1ea5083493ecedd14cb0babad3c2f65a6 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 18 May 2022 15:33:15 +0800 Subject: [PATCH 3/5] enh: return error if cmake fails --- Jenkinsfile2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 20a86dbcea..29f4c45229 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -235,8 +235,8 @@ def pre_test_build_win() { cd debug call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat" x64 set CL=/MP8 - cmake .. -G "NMake Makefiles JOM" - jom -j 4 || exit 8 + cmake .. -G "NMake Makefiles JOM" || exit 7 + jom -j 6 || exit 8 time /t ''' return 1 From cd2f10542dcb4cf37d3388db359332bb425ee11e Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 18 May 2022 15:51:59 +0800 Subject: [PATCH 4/5] enh: add some log --- Jenkinsfile2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 29f4c45229..4eb53c315f 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -215,10 +215,12 @@ def pre_test_win(){ } bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal + git branch git log -5 ''' bat ''' cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community + git branch git log -5 ''' bat ''' @@ -233,9 +235,13 @@ def pre_test_build_win() { cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal mkdir debug cd debug + time /t call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat" x64 set CL=/MP8 + echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> cmake" + time /t cmake .. -G "NMake Makefiles JOM" || exit 7 + echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> jom -j 6" jom -j 6 || exit 8 time /t ''' From c7088f08126a7ccd45f914a3f885b6a60fb5f9df Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Wed, 18 May 2022 16:10:35 +0800 Subject: [PATCH 5/5] enh: print time during windows build --- Jenkinsfile2 | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 4eb53c315f..7a6f793399 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -242,6 +242,7 @@ def pre_test_build_win() { time /t cmake .. -G "NMake Makefiles JOM" || exit 7 echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> jom -j 6" + time /t jom -j 6 || exit 8 time /t '''