commit 937a5cf5c6026da46d25bf09f13845eb283976cb
author philwo <philwo@google.com> Thu Jan 30 02:59:57 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Jan 30 03:00:49 2020 -0800
tree decb1db59d845d72afd9e2ac98df5c864f1a7058
parent 4c87cc4f58190af10a18dbc34b7b60eead47134f

Prevent discarding of analysis cache on Bazel CI.

Bazel currently logs this message when we get to the "bazel test" step of the CI job: "Build option --test_env has changed, discarding analysis cache.".

By putting the relevant flags into build_flags as well (even though they won't have any effect there), Bazel should be able to keep the analysis cache between the two steps.

RELNOTES: None.
PiperOrigin-RevId: 292312588

.bazelci/postsubmit.yml

diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
index 264dbf1..bd8ac87 100644
--- a/.bazelci/postsubmit.yml
+++ b/.bazelci/postsubmit.yml
@@ -6,6 +6,9 @@
         android_ndk_repository/android_ndk_repository/' WORKSPACE
       - rm -f WORKSPACE.bak
       - mkdir $HOME/bazeltest
+    build_flags:
+      - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
     build_targets:
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
@@ -42,6 +45,9 @@
         android_ndk_repository/android_ndk_repository/' WORKSPACE
       - rm -f WORKSPACE.bak
       - mkdir $HOME/bazeltest
+    build_flags:
+      - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
     build_targets:
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
@@ -74,6 +80,10 @@
         android_ndk_repository/android_ndk_repository/' WORKSPACE
       - rm -f WORKSPACE.bak
       - mkdir $HOME/bazeltest
+    build_flags:
+      - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
+      - "--test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80"
     build_targets:
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
@@ -112,6 +122,9 @@
         android_ndk_repository/android_ndk_repository/' WORKSPACE
       - rm -f WORKSPACE.bak
       - mkdir $HOME/bazeltest
+    build_flags:
+      - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
     build_targets:
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
@@ -133,7 +146,9 @@
       - rm -f WORKSPACE.bak
       - mkdir $HOME/bazeltest
     build_flags:
-      - "--apple_platform_type=macos"
+      - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
+      - "--test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80"
     build_targets:
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
@@ -170,6 +185,9 @@
     build_flags:
       - "--copt=-w"
       - "--host_copt=-w"
+      - "--test_env=JAVA_HOME"
+      - "--test_env=TEST_INSTALL_BASE=D:/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
     build_targets:
       - "//src:bazel.exe"
       - "//src:bazel_jdk_minimal"

.bazelci/presubmit.yml

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 53e4d71..7135337 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -7,6 +7,9 @@
         android_ndk_repository/android_ndk_repository/' WORKSPACE
       - rm -f WORKSPACE.bak
       - mkdir $HOME/bazeltest
+    build_flags:
+      - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
     build_targets:
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
@@ -41,6 +44,9 @@
         android_ndk_repository/android_ndk_repository/' WORKSPACE
       - rm -f WORKSPACE.bak
       - mkdir $HOME/bazeltest
+    build_flags:
+      - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
     build_targets:
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
@@ -71,6 +77,10 @@
         android_ndk_repository/android_ndk_repository/' WORKSPACE
       - rm -f WORKSPACE.bak
       - mkdir $HOME/bazeltest
+    build_flags:
+      - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
+      - "--test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80"
     build_targets:
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
@@ -106,6 +116,9 @@
         android_ndk_repository/android_ndk_repository/' WORKSPACE
       - rm -f WORKSPACE.bak
       - mkdir $HOME/bazeltest
+    build_flags:
+      - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
     build_targets:
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
@@ -125,7 +138,9 @@
       - rm -f WORKSPACE.bak
       - mkdir $HOME/bazeltest
     build_flags:
-      - "--apple_platform_type=macos"
+      - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
+      - "--test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80"
     build_targets:
       - "//src:bazel"
       - "//src:bazel_jdk_minimal"
@@ -163,6 +178,9 @@
     build_flags:
       - "--copt=-w"
       - "--host_copt=-w"
+      - "--test_env=JAVA_HOME"
+      - "--test_env=TEST_INSTALL_BASE=D:/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
     build_targets:
       - "//src:bazel.exe"
       - "//src:bazel_jdk_minimal"