Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,38 @@ populate_dep_cache:
# - GRADLE_TARGET: ":smokeTest"
# CACHE_TYPE: "smoke"

publish-artifacts-to-s3:
image: registry.ddbuild.io/images/mirror/amazon/aws-cli:2.4.29
stage: publish
needs: [ build ]
script:
- source upstream.env
- export VERSION="${UPSTREAM_TRACER_VERSION%~*}" # remove ~githash from the end of version
- aws s3 cp workspace/dd-java-agent/build/libs/dd-java-agent-${VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-java-agent.jar
- aws s3 cp workspace/dd-trace-api/build/libs/dd-trace-api-${VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-trace-api.jar
- aws s3 cp workspace/dd-trace-ot/build/libs/dd-trace-ot-${VERSION}.jar s3://dd-trace-java-builds/${CI_COMMIT_REF_NAME}/dd-trace-ot.jar
- aws s3 cp workspace/dd-java-agent/build/libs/dd-java-agent-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-agent.jar
- aws s3 cp workspace/dd-trace-api/build/libs/dd-trace-api-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-trace-api.jar
- aws s3 cp workspace/dd-trace-ot/build/libs/dd-trace-ot-${VERSION}.jar s3://dd-trace-java-builds/${CI_PIPELINE_ID}/dd-trace-ot.jar
- |
cat << EOF > links.json
{
"S3 Links": [
{
"external_link": {
"label": "Public Link to dd-java-agent.jar",
"url": "https://s3.us-east-1.amazonaws.com/dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-agent.jar"
}
}
]
}
EOF
artifacts:
reports:
annotations:
- links.json


spotless:
extends: .gradle_build
stage: tests
Expand Down
6 changes: 3 additions & 3 deletions .gitlab/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
timeout: 1h
tags: ["runner:apm-k8s-tweaked-metal"]
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dd-trace-java-benchmarks
needs: [ "build" ]
needs: [ "build", "publish-artifacts-to-s3" ]
rules:
- if: '$POPULATE_CACHE'
when: never
Expand Down Expand Up @@ -85,7 +85,7 @@ benchmarks-post-results:
interruptible: true
timeout: 1h
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:java-dsm-kafka
needs: [ "build" ]
needs: [ "build", "publish-artifacts-to-s3"]
script:
- git clone --branch java/kafka-dsm-overhead https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform.git platform && cd platform
- ./steps/run-benchmarks.sh
Expand Down Expand Up @@ -129,7 +129,7 @@ debugger-benchmarks:
interruptible: true
timeout: 1h
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:java-debugger
needs: ["build"]
needs: ["build", "publish-artifacts-to-s3"]
script:
- export ARTIFACTS_DIR="$(pwd)/reports" && mkdir -p "${ARTIFACTS_DIR}"
- git clone --branch java/debugger-benchmarks https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform.git /platform && cd /platform
Expand Down
Loading