Skip to content
Draft
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
23 changes: 23 additions & 0 deletions .gitlab/build-and-test-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -510,3 +510,26 @@ test-openresty-all:
- "1.29.2.1"
- "1.29.2.3"
WAF: ["ON", "OFF"]

# Tag-pipeline RUM snapshot uploads. Reuses .upload-rum-snapshot-template
# defined in build-and-test-fast.yml (both files are aggregated into the
# main pipeline, so hidden jobs are visible across).
#
# Don't put 'needs: [build-nginx-rum-all]' — the 62-entry matrix exceeds
# GitLab's 50-need limit. Stage ordering (build-all → test-all → assemble
# → aws) guarantees the build-nginx-rum-all artifacts (including upload/)
# are available.
.upload-rum-snapshot-all:
extends:
- .build-and-test-all
- .upload-rum-snapshot-template

upload-rum-snapshots-all:
extends: .upload-rum-snapshot-all
variables:
S3_PATH: s3://rum-auto-instrumentation/nginx/snapshots/pipeline-${CI_PIPELINE_ID}

upload-rum-snapshots-latest-all:
extends: .upload-rum-snapshot-all
variables:
S3_PATH: s3://rum-auto-instrumentation/nginx/snapshots/latest
17 changes: 10 additions & 7 deletions .gitlab/build-and-test-fast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,6 @@ coverage:

.upload-rum-snapshot-template:
stage: aws
needs:
- job: build-nginx-rum-fast
artifacts: true
- job: test-nginx-rum-fast
tags: ["arch:amd64"]
image: registry.ddbuild.io/images/aws-cli:2.33.12
script:
Expand All @@ -247,8 +243,15 @@ coverage:
done
[ "$failed" -eq 0 ]

upload-rum-branch-snapshots:
.upload-rum-snapshot-fast:
extends: .upload-rum-snapshot-template
needs:
- job: build-nginx-rum-fast
artifacts: true
- job: test-nginx-rum-fast

upload-rum-branch-snapshots:
extends: .upload-rum-snapshot-fast
variables:
S3_PATH: s3://rum-auto-instrumentation/nginx/branch-snapshots/pipeline-${CI_PIPELINE_ID}
rules:
Expand All @@ -257,14 +260,14 @@ upload-rum-branch-snapshots:
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH

upload-rum-snapshots:
extends: .upload-rum-snapshot-template
extends: .upload-rum-snapshot-fast
variables:
S3_PATH: s3://rum-auto-instrumentation/nginx/snapshots/pipeline-${CI_PIPELINE_ID}
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

upload-rum-snapshots-latest:
extends: .upload-rum-snapshot-template
extends: .upload-rum-snapshot-fast
variables:
S3_PATH: s3://rum-auto-instrumentation/nginx/snapshots/latest
rules:
Expand Down
Loading