From 2ef68add11e49d65b4a8057958fd6200fe5a13f9 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 1 Jun 2019 13:01:43 -0400 Subject: [PATCH] jenkins scripts :) --- misc/jenkins/build_working_folder.bat | 17 +++++++++++++---- .../hw_test.bat | 2 +- .../simulator_test.bat | 2 +- .../generate_doxygen/gen_upload_docs.bat | 4 ++-- misc/jenkins/git_to_svn_sync/git2svn.bat | 2 +- misc/jenkins/unit_tests/unit_tests.bat | 8 ++++---- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/misc/jenkins/build_working_folder.bat b/misc/jenkins/build_working_folder.bat index 1498fcbbc1..35bbdc29e7 100644 --- a/misc/jenkins/build_working_folder.bat +++ b/misc/jenkins/build_working_folder.bat @@ -1,3 +1,5 @@ +set script_name=build_working_folder.bat +echo Entering %script_name% echo Working folder: %folder% mkdir %folder% @@ -20,6 +22,9 @@ cp misc/console_launcher/rusefi_console.exe %folder% cd temp echo "Please copy find.exe to findcyg.exe in cygwin folder" findcyg . -name '.svn' > folders_to_delete.txt +IF NOT ERRORLEVEL 0 echo %script_name%: ERROR INVOKING findcyg +IF NOT ERRORLEVEL 0 EXIT /B 1 + echo "Deleting .svn" xargs rm -rf < folders_to_delete.txt echo "Deleted .svn" @@ -27,11 +32,15 @@ rm -rf folders_to_delete.txt echo "Building bundle" pwd -zip -r rusefi_bundle.zip * -IF NOT ERRORLEVEL echo build_working_folder.bat: ERROR INVOKING zip +set zip_name=rusefi_bundle.zip +zip -r %zip_name$ * +IF NOT ERRORLEVEL 0 echo %script_name%: ERROR INVOKING zip IF NOT ERRORLEVEL 0 EXIT /B 1 -echo "Bundle ready" +echo "Bundle %zip_name$ ready" +ls %zip_name% cd .. -echo "build_working_folder.bat: We are back in root directory" +echo "%script_name%: We are back in root directory" + pwd +echo Exiting %script_name% \ No newline at end of file diff --git a/misc/jenkins/functional_test_and_build_bundle/hw_test.bat b/misc/jenkins/functional_test_and_build_bundle/hw_test.bat index 92b79dbeae..ca49b00737 100644 --- a/misc/jenkins/functional_test_and_build_bundle/hw_test.bat +++ b/misc/jenkins/functional_test_and_build_bundle/hw_test.bat @@ -32,7 +32,7 @@ which java which javac ant realtest -IF NOT ERRORLEVEL echo ERROR DETECTED +IF NOT ERRORLEVEL 0 echo ERROR DETECTED IF NOT ERRORLEVEL 0 EXIT /B 1 echo "TIMESTAMP %date% %time%" diff --git a/misc/jenkins/functional_test_and_build_bundle/simulator_test.bat b/misc/jenkins/functional_test_and_build_bundle/simulator_test.bat index 443bd1505e..f2a349bf08 100644 --- a/misc/jenkins/functional_test_and_build_bundle/simulator_test.bat +++ b/misc/jenkins/functional_test_and_build_bundle/simulator_test.bat @@ -8,7 +8,7 @@ which java which javac ant simlator_test -IF NOT ERRORLEVEL echo ERROR DETECTED +IF NOT ERRORLEVEL 0 echo ERROR DETECTED IF NOT ERRORLEVEL 0 EXIT /B 1 echo "TIMESTAMP %date% %time%" diff --git a/misc/jenkins/generate_doxygen/gen_upload_docs.bat b/misc/jenkins/generate_doxygen/gen_upload_docs.bat index ab68f663be..1e133bb3a2 100644 --- a/misc/jenkins/generate_doxygen/gen_upload_docs.bat +++ b/misc/jenkins/generate_doxygen/gen_upload_docs.bat @@ -13,7 +13,7 @@ pwd cd firmware doxygen -IF NOT ERRORLEVEL echo doxygen run FAILED +IF NOT ERRORLEVEL 0 echo doxygen run FAILED IF NOT ERRORLEVEL 0 EXIT /B 1 @@ -22,5 +22,5 @@ rem actually Cygwin http://rusefi.com/wiki/index.php?title=Internal:Software:Bui cd ../doxygen echo Uploading Doxygen ncftpput -R -v -u %RUSEFI_DOXYGEN_FTP_USER% -p %RUSEFI_DOXYGEN_FTP_PASS% %RUSEFI_FTP_SERVER% /html html/* -IF NOT ERRORLEVEL echo upload FAILED +IF NOT ERRORLEVEL 0 echo upload FAILED IF NOT ERRORLEVEL 0 EXIT /B 1 diff --git a/misc/jenkins/git_to_svn_sync/git2svn.bat b/misc/jenkins/git_to_svn_sync/git2svn.bat index 2d67193b36..12da2c6a51 100644 --- a/misc/jenkins/git_to_svn_sync/git2svn.bat +++ b/misc/jenkins/git_to_svn_sync/git2svn.bat @@ -7,7 +7,7 @@ pwd echo Updating from GIT call git fetch --all call git reset --hard origin/master -IF NOT ERRORLEVEL echo ERROR git pull-ing +IF NOT ERRORLEVEL 0 echo ERROR git pull-ing IF NOT ERRORLEVEL 0 EXIT /B 1 diff --git a/misc/jenkins/unit_tests/unit_tests.bat b/misc/jenkins/unit_tests/unit_tests.bat index a60f2c62dd..dfaf0df732 100644 --- a/misc/jenkins/unit_tests/unit_tests.bat +++ b/misc/jenkins/unit_tests/unit_tests.bat @@ -15,7 +15,7 @@ git submodule update --init rm -fR .dep rm -fR build call update_version.bat -IF NOT ERRORLEVEL echo ERROR INVOKING VERSION HEADER GENERATOR +IF NOT ERRORLEVEL 0 echo ERROR INVOKING VERSION HEADER GENERATOR IF NOT ERRORLEVEL 0 EXIT /B 1 @@ -40,7 +40,7 @@ echo "TIMESTAMP %date% %time% Unit tests build looks good, now executing unit te cd build call rusefi_test.exe -IF NOT ERRORLEVEL echo UNIT TEST FAILED +IF NOT ERRORLEVEL 0 echo UNIT TEST FAILED IF NOT ERRORLEVEL 0 EXIT /B 1 cd .. @@ -53,11 +53,11 @@ pwd echo Preparing firmware-only fast upload zip -j firmware/build/rusefi_firmware.zip firmware/svnversion.h firmware/build/rusefi.hex firmware/build/rusefi.bin firmware/build/rusefi.elf firmware/tunerstudio/rusefi.ini -IF NOT ERRORLEVEL echo Invoking ZIP has failed +IF NOT ERRORLEVEL 0 echo Invoking ZIP has failed IF NOT ERRORLEVEL 0 EXIT /B 1 echo "TIMESTAMP %date% %time% Now uploading only firmware ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %FTP_SERVER% separate_files firmware/build/rusefi_firmware.zip -IF NOT ERRORLEVEL echo Invoking ncftpput has failed +IF NOT ERRORLEVEL 0 echo Invoking ncftpput has failed IF NOT ERRORLEVEL 0 EXIT /B 1