Skip to content

Commit

Permalink
KAFKA-18454 Publish build scans to develocity.apache.org (apache#18539)
Browse files Browse the repository at this point in the history
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 <[email protected]>, David Arthur <[email protected]>
  • Loading branch information
clayburn authored Jan 21, 2025
1 parent b368c38 commit e9e03fa
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/scripts/develocity_reports.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-complete.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deflake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
// 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'
}

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
Expand Down

0 comments on commit e9e03fa

Please sign in to comment.