commit 502c672f1786283dedf166526b92742f6f0aedaf
author Ray Milkey <ray@opennetworking.org> Mon Oct 14 16:15:11 2019 -0700
committer Ray Milkey <ray@opennetworking.org> Tue Oct 15 11:02:35 2019 -0700
tree b37aab7003fb06fee308b73daf6748ab9d364ccd
parent d7e71d0ed1e8796d17f99fda41d4794b19ae3b02

Use bazel version 1.0.0 for onos-2.2 and master branches

Change-Id: I1e040649df3b426135ccc0072c506e781fc104e3

jjb/defaults.yaml

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 65ade31..eb719c5 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -5,7 +5,7 @@
     name: global
 
     # lftools
-    lftools-version: <1.0.0
+    lftools-version: '~=0.26.2'
 
     # lf-infra-defaults
     jenkins-ssh-credential: 'onos-jenkins-ssh'

jjb/onos/install-bazel.sh

diff --git a/jjb/onos/install-bazel.sh b/jjb/onos/install-bazel.sh
index 86c01f4..1912879 100644
--- a/jjb/onos/install-bazel.sh
+++ b/jjb/onos/install-bazel.sh
@@ -8,7 +8,7 @@
     BAZEL_VERSION="0.19.2"
 else
     if [ ${GERRIT_BRANCH} == "master" -o ${GERRIT_BRANCH} == "onos-2.2" ]; then
-        BAZEL_VERSION="0.27.0"
+        BAZEL_VERSION="1.0.0"
     else
         BAZEL_VERSION="0.24.1"
     fi