Skip to content

Commit 48ab511

Browse files
authored
Merge branch 'master' into jb/zstd_improvement
2 parents 2587735 + e0a1fc0 commit 48ab511

4 files changed

Lines changed: 11 additions & 44 deletions

File tree

.circleci/upload_ciapp.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ java_prop() {
2020
# Upload test results to CI Visibility
2121
junit_upload() {
2222
# based on tracer implementation: https://github.com/DataDog/dd-trace-java/blob/master/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/TestDecorator.java#L55-L77
23+
# Overwriting the tag with the GitHub repo URL instead of the GitLab one. Otherwise, some Test Optimization features won't work.
2324
DD_API_KEY=$1 \
2425
datadog-ci junit upload --service $SERVICE_NAME \
2526
--logs \
@@ -30,6 +31,7 @@ junit_upload() {
3031
--tags "os.architecture:$(java_prop os.arch)" \
3132
--tags "os.platform:$(java_prop os.name)" \
3233
--tags "os.version:$(java_prop os.version)" \
34+
--tags "git.repository_url:https://github.com/DataDog/dd-trace-java" \
3335
./results
3436
}
3537

.github/workflows/README.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,6 @@ _Action:_
115115

116116
_Notes:_ Results are sent on both production and staging environments.
117117

118-
### check-ci-pipelines [🔗](check-ci-pipelines.yaml)
119-
120-
_Trigger:_ When opening or updating a PR.
121-
122-
_Action:_ This action will check all other continuous integration jobs (Github action, Gitlab, CircleCi), and will fail if any of them fails.
123-
The purpose of this job is to be required for PR merges, achieving Green CI Policy.
124-
It got an `ignored` parameters to exclude some jobs if they are temprorary failing.
125-
126-
_Recovery:_ Manually trigger the action on the desired branch.
127-
128118
### comment-on-submodule-update [🔗](comment-on-submodule-update.yaml)
129119

130120
_Trigger:_ When creating a PR commits to `master` or a `release/*` branch with a Git Submodule update.

.github/workflows/check-ci-pipelines.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/run-system-tests.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,12 @@ jobs:
6262
scenarios_groups: tracer-release
6363
excluded_scenarios: CROSSED_TRACING_LIBRARIES,INTEGRATIONS_AWS,APM_TRACING_E2E_OTEL,APM_TRACING_E2E_SINGLE_SPAN,PROFILING # require AWS and datadog credentials
6464
skip_empty_scenarios: true
65+
66+
# Ensure the main job is run to completion
67+
check:
68+
name: Check system tests success
69+
runs-on: ubuntu-latest
70+
needs:
71+
- main
72+
steps:
73+
- run: exit 0

0 commit comments

Comments
 (0)