Copy Jenkinsfile from upstream/master to fix the build.

apache · Oct 10, 2017 · 99083f1 · 99083f1
1 parent e6cad58
commit 99083f1
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,12 +13,13 @@ err = null
 
 // initialize source codes
 def init_git() {
+  deleteDir()
   retry(5) {
     try {
       timeout(time: 2, unit: 'MINUTES') {
         checkout scm
         sh 'git submodule update --init'
-        sh 'git clean -d -f'
+        sh 'git clean -d -f'        
       }
     } catch (exc) {
       deleteDir()
@@ -29,12 +30,13 @@ def init_git() {
 }
 
 def init_git_win() {
+  deleteDir()
   retry(5) {
     try {
       timeout(time: 2, unit: 'MINUTES') {
         checkout scm
         bat 'git submodule update --init'
-        bat 'git clean -d -f'
+        bat 'git clean -d -f'        
       }
     } catch (exc) {
       deleteDir()
@@ -50,10 +52,6 @@ def init_git_win() {
 def make(docker_type, make_flag) {
   timeout(time: max_time, unit: 'MINUTES') {
     try {
-      sh "${docker_run} ${docker_type} sudo rm -rf *"
-      sh "${docker_run} ${docker_type} sudo git reset --hard"
-      // sh "${docker_run} ${docker_type} sudo make clean"
-      // sh "${docker_run} ${docker_type} sudo make -C amalgamation/ clean"
       sh "${docker_run} ${docker_type} make ${make_flag}"
     } catch (exc) {
       echo 'Incremental compilation failed. Fall back to build from scratch'