From 6774be9f13d4ca3510a3d5b729574cafc3b8ef37 Mon Sep 17 00:00:00 2001
From: Lizan Zhou <zlizan@google.com>
Date: Fri, 17 Mar 2017 12:04:25 -0700
Subject: [PATCH 1/2] Move .bazelrc to tools/bazel.rc

---
 .travis.yml                | 3 +--
 .bazelrc => tools/bazel.rc | 0
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename .bazelrc => tools/bazel.rc (100%)

diff --git a/.travis.yml b/.travis.yml
index 88be42c285b..418e24d2dee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,8 +35,7 @@ before_install:
   - sudo dpkg -i bazel_${BAZEL_VERSION}-linux-x86_64.deb
   - sudo apt-get -f install -qqy uuid-dev
   - cd ${TRAVIS_BUILD_DIR}
-  - mv .bazelrc .bazelrc.orig
-  - cat .bazelrc.travis .bazelrc.orig > .bazelrc
+  - mv .bazelrc.travis .bazelrc
 
 script:
   - script/check-style
diff --git a/.bazelrc b/tools/bazel.rc
similarity index 100%
rename from .bazelrc
rename to tools/bazel.rc

From 97df1793084e6bd3b45db36cc498bc3ab02b6cdf Mon Sep 17 00:00:00 2001
From: Sebastien Vas <sebastienvas@google.com>
Date: Fri, 17 Mar 2017 15:16:31 -0700
Subject: [PATCH 2/2] Update Jenkinsfile with latest version of pipeline

---
 Jenkinsfile | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 35b530333b1..6575dc498f5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
 #!groovy
 
-@Library('testutils@stable-838b134')
+@Library('testutils@stable-63c264e')
 
 import org.istio.testutils.Utilities
 import org.istio.testutils.GitUtilities
@@ -12,20 +12,17 @@ def utils = new Utilities()
 def bazel = new Bazel()
 
 mainFlow(utils) {
-  pullRequest(utils) {
-    node {
-      gitUtils.initialize()
-      // Proxy does build work correctly with Hazelcast.
-      // Must use .bazelrc.jenkins
-      bazel.setVars('', '')
-    }
-
-    if (utils.runStage('PRESUBMIT')) {
-      presubmit(gitUtils, bazel)
-    }
-    if (utils.runStage('POSTSUBMIT')) {
-      postsubmit(gitUtils, bazel, utils)
-    }
+  node {
+    gitUtils.initialize()
+    // Proxy does build work correctly with Hazelcast.
+    // Must use .bazelrc.jenkins
+    bazel.setVars('', '')
+  }
+  if (utils.runStage('PRESUBMIT')) {
+    presubmit(gitUtils, bazel)
+  }
+  if (utils.runStage('POSTSUBMIT')) {
+    postsubmit(gitUtils, bazel, utils)
   }
 }
 
@@ -62,4 +59,4 @@ def postsubmit(gitUtils, bazel, utils) {
       utils.publishDockerImages(images, tags, 'release')
     }
   }
-}
\ No newline at end of file
+}