From c1569025ea2cfb36b2cd5361fc81f725f87cedd8 Mon Sep 17 00:00:00 2001 From: Clay Johnson Date: Tue, 7 Jan 2025 13:41:32 -0600 Subject: [PATCH 1/4] Publish build scans to develocity.apache.org --- .github/scripts/develocity_reports.py | 6 +++--- .github/workflows/ci-complete.yml | 2 +- settings.gradle | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/scripts/develocity_reports.py b/.github/scripts/develocity_reports.py index d342cf86e1c88..9378cc58d390e 100644 --- a/.github/scripts/develocity_reports.py +++ b/.github/scripts/develocity_reports.py @@ -815,7 +815,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", @@ -839,7 +839,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: @@ -1052,7 +1052,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/ci-complete.yml b/.github/workflows/ci-complete.yml index 982eb7725e0a0..7196ba30f2637 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 }} diff --git a/settings.gradle b/settings.gradle index dd76b7690251a..994aecb9378d9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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 From daefeab9f283f6e3a5ec01a35011a2cd4e057886 Mon Sep 17 00:00:00 2001 From: Clay Johnson Date: Tue, 7 Jan 2025 13:41:47 -0600 Subject: [PATCH 2/4] Update Develocity plugin versions --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 994aecb9378d9..4b180b0f3e2cf 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.18.2' id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2' } From 8214d3ee92102441653e20e3b7d12ad597ad3a9e Mon Sep 17 00:00:00 2001 From: Clay Johnson Date: Tue, 7 Jan 2025 13:45:59 -0600 Subject: [PATCH 3/4] Use `DEVELOCITY_ACCESS_KEY` to authenticate to `develocity.apache.org` --- .github/workflows/build.yml | 4 ++-- .github/workflows/ci-complete.yml | 2 +- .github/workflows/deflake.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 7196ba30f2637..b2d26351545f4 100644 --- a/.github/workflows/ci-complete.yml +++ b/.github/workflows/ci-complete.yml @@ -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 From c6f18df8262e093ee8bb0b75ffe8140ba9eccaa2 Mon Sep 17 00:00:00 2001 From: Chia-Ping Tsai Date: Tue, 21 Jan 2025 20:16:12 +0800 Subject: [PATCH 4/4] upgrade to 3.19 --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 4b180b0f3e2cf..e640ba906256f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,7 +14,7 @@ // limitations under the License. plugins { - id 'com.gradle.develocity' version '3.18.2' + id 'com.gradle.develocity' version '3.19' id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2' }