From e9e03faf87879ad3742164938000f6abbfe617ca Mon Sep 17 00:00:00 2001 From: Clay Johnson Date: Tue, 21 Jan 2025 12:37:27 -0600 Subject: [PATCH] KAFKA-18454 Publish build scans to develocity.apache.org (#18539) This patch includes some maintenance updates for Develocity. * Publish build scans to develocity.apache.org * Update Develocity Gradle plugin to to 3.19 * Use `DEVELOCITY_ACCESS_KEY` to authenticate to `develocity.apache.org` Reviewers: Chia-Ping Tsai , David Arthur --- .github/scripts/develocity_reports.py | 6 +++--- .github/workflows/build.yml | 4 ++-- .github/workflows/ci-complete.yml | 4 ++-- .github/workflows/deflake.yml | 2 +- settings.gradle | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/scripts/develocity_reports.py b/.github/scripts/develocity_reports.py index 74df32a3edeaf..8502c774d7547 100644 --- a/.github/scripts/develocity_reports.py +++ b/.github/scripts/develocity_reports.py @@ -889,7 +889,7 @@ def get_develocity_class_link(class_name: str, threshold_days: int, test_type: s threshold_days: Number of days to look back in search test_type: Type of test (e.g., "quarantinedTest", "test") """ - base_url = "https://ge.apache.org/scans/tests" + base_url = "https://develocity.apache.org/scans/tests" params = { "search.rootProjectNames": "kafka", "search.tags": "github,trunk", @@ -913,7 +913,7 @@ def get_develocity_method_link(class_name: str, method_name: str, threshold_days threshold_days: Number of days to look back in search test_type: Type of test (e.g., "quarantinedTest", "test") """ - base_url = "https://ge.apache.org/scans/tests" + base_url = "https://develocity.apache.org/scans/tests" # Extract just the method name without the class prefix if '.' in method_name: @@ -1186,7 +1186,7 @@ def main(): exit(1) # Configuration - BASE_URL = "https://ge.apache.org" + BASE_URL = "https://develocity.apache.org" PROJECT = "kafka" QUARANTINE_THRESHOLD_DAYS = 7 MIN_FAILURE_RATE = 0.1 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d878a52ddac29..e1992a4059281 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -103,7 +103,7 @@ jobs: java-version: 23 gradle-cache-read-only: ${{ !inputs.is-trunk }} gradle-cache-write-only: ${{ inputs.is-trunk }} - develocity-access-key: ${{ secrets.GE_ACCESS_TOKEN }} + develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Compile and validate env: SCAN_ARG: ${{ inputs.is-public-fork && '--no-scan' || '--scan' }} @@ -168,7 +168,7 @@ jobs: java-version: ${{ matrix.java }} gradle-cache-read-only: ${{ !inputs.is-trunk }} gradle-cache-write-only: ${{ inputs.is-trunk }} - develocity-access-key: ${{ secrets.GE_ACCESS_TOKEN }} + develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} # If the load-catalog job failed, we won't be able to download the artifact. Since we don't want this to fail # the overall workflow, so we'll continue here without a test catalog. diff --git a/.github/workflows/ci-complete.yml b/.github/workflows/ci-complete.yml index 982eb7725e0a0..b2d26351545f4 100644 --- a/.github/workflows/ci-complete.yml +++ b/.github/workflows/ci-complete.yml @@ -30,7 +30,7 @@ run-name: Build Scans for ${{ github.event.workflow_run.display_title}} # # This "workflow_run" triggered workflow is run in a privileged context and so does have access to # the repository secrets. Here we can download the build scan files produced by a PR and publish -# them to ge.apache.org. +# them to develocity.apache.org. # # If we need to do things like comment on, label, or otherwise modify PRs from public forks. This # workflow is the place to do it. PR number is ${{ github.event.workflow_run.pull_requests[0].number }} @@ -59,7 +59,7 @@ jobs: uses: ./.github/actions/setup-gradle with: java-version: ${{ matrix.java }} - develocity-access-key: ${{ secrets.GE_ACCESS_TOKEN }} + develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Download build scan archive id: download-build-scan uses: actions/download-artifact@v4 diff --git a/.github/workflows/deflake.yml b/.github/workflows/deflake.yml index 0845c12b9aa64..fa55ab5fb120b 100644 --- a/.github/workflows/deflake.yml +++ b/.github/workflows/deflake.yml @@ -50,7 +50,7 @@ jobs: with: java-version: ${{ inputs.java-version }} gradle-cache-read-only: true - develocity-access-key: ${{ secrets.GE_ACCESS_TOKEN }} + develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Test timeout-minutes: 60 id: junit-test diff --git a/settings.gradle b/settings.gradle index dd76b7690251a..e640ba906256f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,7 +14,7 @@ // limitations under the License. plugins { - id 'com.gradle.develocity' version '3.17.6' + id 'com.gradle.develocity' version '3.19' id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2' } @@ -22,7 +22,7 @@ def isGithubActions = System.getenv('GITHUB_ACTIONS') != null def currentJvm = JavaVersion.current() develocity { - server = "https://ge.apache.org" + server = "https://develocity.apache.org" projectId = "kafka" buildScan { uploadInBackground = !isGithubActions