[incubator-mxnet] branch master updated: Improved git reset for CI builds (#12784)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

marcoabreu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new 6c4bbd8  Improved git reset for CI builds (#12784)
6c4bbd8 is described below

commit 6c4bbd8d1889cecb3e13363fe4c14e52941d10db
Author: Anton Chernov <me...@gmail.com>
AuthorDate: Wed Nov 7 11:35:36 2018 +0100

    Improved git reset for CI builds (#12784)
---
 ci/Jenkinsfile_utils.groovy | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ci/Jenkinsfile_utils.groovy b/ci/Jenkinsfile_utils.groovy
index e2b0855..43f296a 100644
--- a/ci/Jenkinsfile_utils.groovy
+++ b/ci/Jenkinsfile_utils.groovy
@@ -26,8 +26,11 @@ def init_git() {
       // retries as this will increase the amount of requests and worsen the throttling
       timeout(time: 15, unit: 'MINUTES') {
         checkout scm
-        sh 'git submodule update --init --recursive'
         sh 'git clean -xdff'
+        sh 'git reset --hard'
+        sh 'git submodule update --init --recursive'
+        sh 'git submodule foreach --recursive git clean -ffxd'
+        sh 'git submodule foreach --recursive git reset --hard'
       }
     } catch (exc) {
       deleteDir()
@@ -45,8 +48,11 @@ def init_git_win() {
       // retries as this will increase the amount of requests and worsen the throttling
       timeout(time: 15, unit: 'MINUTES') {
         checkout scm
-        bat 'git submodule update --init --recursive'
         bat 'git clean -xdff'
+        bat 'git reset --hard'
+        bat 'git submodule update --init --recursive'
+        bat 'git submodule foreach --recursive git clean -ffxd'
+        bat 'git submodule foreach --recursive git reset --hard'
       }
     } catch (exc) {
       deleteDir()