8000 Add artifacts to public s3 bucket (#8947) · DataDog/dd-trace-java@796e6d2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 796e6d2

Browse files
randomandersonrandomanderson
authored
Add artifacts to public s3 bucket (#8947)
* publish artifacts to S3 * fix path * fix c/p errors * more c/p errors * missing comma in json
1 parent c4e17f1 commit 796e6d2

File tree

2 files changed

+35
-3
lines changed

2 files changed

+35
-3
lines changed

‎.gitlab-ci.yml

Lines changed: 32 additions & 0 deletions
< 8000 /tr>
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,38 @@ populate_dep_cache:
218218
# - GRADLE_TARGET: ":smokeTest"
219219
# CACHE_TYPE: "smoke"
220220

221+
publish-artifacts-to-s3:
222+
image: registry.ddbuild.io/images/mirror/amazon/aws-cli:2.4.29
223+
stage: publish
224+
needs: [ build ]
225+
script:
226+
- source upstream.env
227+
- export VERSION="${UPSTREAM_TRACER_VERSION%~*}" # remove ~githash from the end of version
228+
- 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
229+
- 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
230+
- 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
231+
- 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
232+
- 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
233+
- 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
234+
- |
235+
cat << EOF > links.json
236+
{
237+
"S3 Links": [
238+
{
239+
"external_link": {
240+
"label": "Public Link to dd-java-agent.jar",
241+
"url": "https://s3.us-east-1.amazonaws.com/dd-trace-java-builds/${CI_PIPELINE_ID}/dd-java-agent.jar"
242+
}
243+
}
244+
]
245+
}
246+
EOF
247+
artifacts:
248+
reports:
249+
annotations:
250+
- links.json
251+
252+
221253
spotless:
222254
extends: .gradle_build
223255
stage: tests

‎.gitlab/benchmarks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
timeout: 1h
55
tags: ["runner:apm-k8s-tweaked-metal"]
66
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dd-trace-java-benchmarks
7-
needs: [ "build" ]
7+
needs: [ "build", "publish-artifacts-to-s3" ]
88
rules:
99
- if: '$POPULATE_CACHE'
1010
when: never
@@ -85,7 +85,7 @@ benchmarks-post-results:
8585
interruptible: true
8686
timeout: 1h
8787
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:java-dsm-kafka
88-
needs: [ "build" ]
88+
needs: [ "build", "publish-artifacts-to-s3"]
8989
script:
9090
- git clone --branch java/kafka-dsm-overhead https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform.git platform && cd platform
9191
- ./steps/run-benchmarks.sh
@@ -129,7 +129,7 @@ debugger-benchmarks:
129129
interruptible: true
130130
timeout: 1h
131131
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:java-debugger
132-
needs: ["build"]
132+
needs: ["build", "publish-artifacts-to-s3"]
133133
script:
134134
- export ARTIFACTS_DIR="$(pwd)/reports" && mkdir -p "${ARTIFACTS_DIR}"
135135
- git clone --branch java/debugger-benchmarks https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform.git /platform && cd /platform

0 commit comments

Comments
 (0)
0