Fixes bazel.rc issues (envoyproxy#212)

* Fixes bazel rc issues * Update Jenkins to latest pipeline version
rshriram · Apr 1, 2017 · 2fae2d7 · 2fae2d7
1 parent 8c2bbce
commit 2fae2d7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -37,7 +37,8 @@ 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.travis .bazelrc
+  - mv tools/bazel.rc tools/bazel.rc.orig
+  - cat tools/bazel.rc.travis tools/bazel.rc.orig > tools/bazel.rc
 
 script:
   - script/check-style

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,6 +1,6 @@
 #!groovy
 
-@Library('testutils@stable-63c264e')
+@Library('testutils@stable-3e4d089')
 
 import org.istio.testutils.Utilities
 import org.istio.testutils.GitUtilities

diff --git a/.bazelrc.jenkins → tools/bazel.rc.jenkins b/.bazelrc.jenkins → tools/bazel.rc.jenkins
diff --git a/.bazelrc.travis → tools/bazel.rc.travis b/.bazelrc.travis → tools/bazel.rc.travis