[CALCITE-5034] Remove unused remote S3 build cache

At the moment the cache is not used since nobody is paying for the service. Remove all related logic since the code does not serve any purpose. If we ever decide to use another remote cache we can bring back the code.
zabetak · Aug 1, 2024 · d75f90b · d75f90b
1 parent 9fa1e16
commit d75f90b
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 103 deletions.
diff --git a/.github/workflows/buildcache.yml b/.github/workflows/buildcache.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -63,12 +63,9 @@ jobs:
     - uses: burrunan/gradle-cache-action@v1
       name: Test
       env:
-        S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
-        S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
       with:
         job-id: jdk${{ matrix.jdk }}
-        remote-build-cache-proxy-enabled: false
         arguments: --scan --no-parallel --no-daemon build javadoc
     - name: 'sqlline and sqllsh'
       shell: cmd
@@ -322,12 +319,9 @@ jobs:
     - uses: burrunan/gradle-cache-action@v1
       name: Build Avatica
       env:
-        S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
-        S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
       with:
         job-id: avatica-jdk${{ matrix.jdk }}
-        remote-build-cache-proxy-enabled: false
         build-root-directory: ../calcite-avatica
         arguments: publishToMavenLocal
         properties: |
@@ -339,12 +333,9 @@ jobs:
     - uses: burrunan/gradle-cache-action@v1
       name: Test
       env:
-        S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
-        S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
       with:
         job-id: jdk${{ matrix.jdk }}
-        remote-build-cache-proxy-enabled: false
         execution-only-caches: true
         arguments: --scan --no-parallel --no-daemon build javadoc
         properties: |
@@ -367,12 +358,9 @@ jobs:
       - uses: burrunan/gradle-cache-action@v1
         name: Test
         env:
-          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
-          S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         with:
           job-id: jdk21
-          remote-build-cache-proxy-enabled: false
           arguments: --scan --no-parallel --no-daemon build javadoc
       - name: 'sqlline and sqllsh'
         run: |
@@ -402,12 +390,9 @@ jobs:
       - uses: burrunan/gradle-cache-action@v1
         name: Test
         env:
-          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
-          S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         with:
           job-id: errprone
-          remote-build-cache-proxy-enabled: false
           arguments: --scan --no-parallel --no-daemon -Pguava.version=${{ env.GUAVA }} -PenableErrorprone classes
 
   linux-checkerframework:
@@ -425,12 +410,9 @@ jobs:
       - name: 'Run CheckerFramework'
         uses: burrunan/gradle-cache-action@v1
         env:
-          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
-          S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         with:
           job-id: checkerframework-jdk11
-          remote-build-cache-proxy-enabled: false
           arguments: --scan --no-parallel --no-daemon -PenableCheckerframework :linq4j:classes :core:classes
 
   linux-checkerframework-guava29:
@@ -450,12 +432,9 @@ jobs:
       - name: 'Run CheckerFramework'
         uses: burrunan/gradle-cache-action@v1
         env:
-          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
-          S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         with:
           job-id: checkerframework-jdk11
-          remote-build-cache-proxy-enabled: false
           arguments: --scan --no-parallel --no-daemon -Pguava.version=${{ env.GUAVA }} -PenableCheckerframework :linq4j:classes :core:classes
 
   linux-slow:
@@ -476,12 +455,9 @@ jobs:
       - uses: burrunan/gradle-cache-action@v1
         name: Test
         env:
-          S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
-          S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         with:
           job-id: jdk8
-          remote-build-cache-proxy-enabled: false
           arguments: --scan --no-parallel --no-daemon testSlow
 
   linux-druid:
@@ -523,11 +499,8 @@ jobs:
       name: 'Run Druid tests'
       timeout-minutes: 10
       env:
-        S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
-        S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
         GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
       with:
         build-root-directory: ./calcite
         job-id: Druid8
-        remote-build-cache-proxy-enabled: false
         arguments: --scan --no-parallel --no-daemon :druid:test -Dcalcite.test.druid=true
diff --git a/gradle.properties b/gradle.properties
@@ -19,7 +19,6 @@ org.gradle.parallel=true
 # Build cache can be disabled with --no-build-cache option
 org.gradle.caching=true
 #org.gradle.caching.debug=true
-s3.build.cache=true
 # See https://github.com/gradle/gradle/pull/11358 , https://issues.apache.org/jira/browse/INFRA-14923
 # repository.apache.org does not yet support .sha256 and .sha512 checksums
 systemProp.org.gradle.internal.publish.checksums.insecure=true
@@ -45,7 +44,6 @@ calcite.avatica.version=1.25.0
 com.autonomousapps.dependency-analysis.version=0.71.0
 org.checkerframework.version=0.5.16
 com.github.autostyle.version=3.0
-com.github.burrunan.s3-build-cache.version=1.2
 com.github.johnrengelman.shadow.version=5.1.0
 com.github.spotbugs.version=2.0.0
 com.github.vlsi.vlsi-release-plugins.version=1.90

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -26,7 +26,6 @@ pluginManagement {
         idv("com.autonomousapps.dependency-analysis")
         idv("org.checkerframework")
         idv("com.github.autostyle")
-        idv("com.github.burrunan.s3-build-cache")
         idv("com.github.johnrengelman.shadow")
         idv("com.github.spotbugs")
         idv("com.github.vlsi.crlf", "com.github.vlsi.vlsi-release-plugins")
@@ -57,7 +56,6 @@ pluginManagement {
 plugins {
     id("com.gradle.enterprise")
     id("com.gradle.common-custom-user-data-gradle-plugin")
-    id("com.github.burrunan.s3-build-cache")
 }
 
 // This is the name of a current project
@@ -123,23 +121,10 @@ gradleEnterprise {
 }
 
 // Cache build artifacts, so expensive operations do not need to be re-computed
-// The logic is as follows:
-//  1. Cache is populated only in CI that has S3_BUILD_CACHE_ACCESS_KEY_ID and
-//     S3_BUILD_CACHE_SECRET_KEY (GitHub Actions in main branch)
-//  2. Otherwise the cache is read-only (e.g. everyday builds and PR builds)
 buildCache {
     local {
         isEnabled = !isCiServer
     }
-    if (property("s3.build.cache")?.ifBlank { "true" }?.toBoolean() == true) {
-        val pushAllowed = property("s3.build.cache.push")?.ifBlank { "true" }?.toBoolean() ?: true
-        remote<com.github.burrunan.s3cache.AwsS3BuildCache> {
-            region = "us-east-2"
-            bucket = "calcite-gradle-cache"
-            endpoint = "s3.us-east-2.wasabisys.com"
-            isPush = isCiServer && pushAllowed && !awsAccessKeyId.isNullOrBlank()
-        }
-    }
 }
 
 // This enables to use local clone of vlsi-release-plugins for debugging purposes