Move .bazelrc to tools/bazel.rc (envoyproxy#186)

* Move .bazelrc to tools/bazel.rc * Update Jenkinsfile with latest version of pipeline
rshriram · Mar 20, 2017 · 20c5bab · 20c5bab
1 parent 93ea507
commit 20c5bab
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git 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/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')
     }
   }
-}
+}
diff --git a/.bazelrc → tools/bazel.rc b/.bazelrc → tools/bazel.rc