Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[smp]: move smp junit upload to new job #30198

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[smp]: move smp junit upload to new job #30198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions .gitlab/functional_test/regression_detector.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,6 @@ single-machine-performance-regression_detector:
# space characters. This avoids
# https://gitlab.com/gitlab-org/gitlab/-/issues/217231.
- cat outputs/report.md | sed "s/^\$/$(echo -ne '\uFEFF\u00A0\u200B')/g"
# Upload JUnit XML outside of Agent CI's tooling because the `junit_upload`
# invoke task has additional logic that does not seem to apply well to SMP's
# JUnit XML. Agent CI seems to use `datadog-agent` as the service name when
# uploading JUnit XML, so the upload command below respects that convention.
- DATADOG_API_KEY="$("$CI_PROJECT_DIR"/tools/ci/fetch_secret.sh "$AGENT_API_KEY_ORG2" token)" || exit $?; export DATADOG_API_KEY
- datadog-ci junit upload --service datadog-agent outputs/junit.xml
# Finally, exit 1 if the job signals a regression else 0.
- RUST_LOG="${RUST_LOG}" ./smp --team-id ${SMP_AGENT_TEAM_ID} --api-base ${SMP_API} --aws-named-profile ${AWS_NAMED_PROFILE}
job result
Expand All @@ -156,7 +150,7 @@ single-machine-performance-regression_detector-pr-comment:
variables:
# Not using the entrypoint script for the pr-commenter image
FF_KUBERNETES_HONOR_ENTRYPOINT: false
allow_failure: true # allow_failure here should have same setting as in job above
allow_failure: true
script: # ignore error message about no PR, because it happens for dev branches without PRs
# We need to transform the Markdown report into a valid JSON string (without
# quotes) in order to pass a well-formed payload to the PR commenting
Expand Down Expand Up @@ -201,3 +195,21 @@ single-machine-performance-regression_detector-pr-comment:
exit 0
fi
exit $exitcode

single-machine-performance-regression_detector-junit-upload:
stage: functional_test
rules:
- !reference [.except_main_or_release_branch]
- when: on_success
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent-buildimages/docker_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
tags: ["runner:docker"]
needs:
- job: single-machine-performance-regression_detector
allow_failure: true
script:
# Upload JUnit XML outside of Agent CI's tooling because the `junit_upload`
# invoke task has additional logic that does not seem to apply well to SMP's
# JUnit XML. Agent CI seems to use `datadog-agent` as the service name when
# uploading JUnit XML, so the upload command below respects that convention.
- DATADOG_API_KEY="$("$CI_PROJECT_DIR"/tools/ci/fetch_secret.sh "$AGENT_API_KEY_ORG2" token)" || exit $?; export DATADOG_API_KEY
- datadog-ci junit upload --service datadog-agent outputs/junit.xml
Loading