From 33255d95f6277ab4a68af3402978f17b18e525f3 Mon Sep 17 00:00:00 2001
From: Yi Hu <yathu@google.com>
Date: Tue, 19 Mar 2024 16:32:11 -0400
Subject: [PATCH] Revert "Disable remote gradle cache until it is cleaned
 (#30584)" (#30674)

This reverts commit a3ea9ef706cf798fc1f6b026dcdf7171434e74d8.
---
 .../beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.json     | 3 ---
 settings.gradle.kts                                          | 5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 .github/trigger_files/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.json

diff --git a/.github/trigger_files/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.json b/.github/trigger_files/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.json
deleted file mode 100644
index c4edaa85a89d..000000000000
--- a/.github/trigger_files/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "comment": "Modify this file in a trivial way to cause this test suite to run"
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 712d230271d2..417fc87baa2d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -62,9 +62,8 @@ buildCache {
       username = System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME")
       password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
     }
-    // TODO(yathu) re-enable when remote gradle cache cleaned up
-    isEnabled = false // !System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME").isNullOrBlank()
-    isPush = false
+    isEnabled = !System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME").isNullOrBlank()
+    isPush = isCi
   }
 }