Skip to content

Commit abd12ae

Browse files
Backport unified pipeline for APM SDKs for SSI artifacts (#5868)
## Summary of changes This is a backport of #5818 to the 2.x release branch. The main difference is that 2.x needs the init images for musl published under the `-musl` tag suffix ## Reason for change By using the unified pipeline across all APM libraries, there is less maintenance hassle, fewer mistakes, and a more uniform creation of artifacts. ## Implementation details I kept all of the changes from the original PR isolated to a single commit for ease of review. The goal of the changes was to do the minimal without having to change `one-pipeline` upstream. **download-single-step-artifacts.sh** : download the musl tarball from Github releases **prepare-oci-package.sh** : if `LIBC` is `musl` use the `musl` tarball **gitlab-ci.yml** : * package-oci-musl : I couldn't change the `package-oci` matrix without having dependency/artifact issues so a new job is created to build the musl oci package. This package is only used to create the lib injection image and the OCI package is not published anywhere * create-arch-specific-lib-injection-image-musl: build the lib injection image from package-oci-musl. The hack is that `ARCH` is abused to get the tag to be `COMMIT_SHA-musl` . A multiach image is unneeded because only amd64 supports musl and the single arch image is tagged correctly. * generate-lib-init-pinned-tag-values : The `master` version overrode one-pipeline to add `musl` tag to everything. That override is removed * generate-lib-init-pinned-tag-values-musl: Generates the musl tags * publish-lib-init-pinned-tags-musl : publishes the musl tags using `COMMIT_SHA-musl` as the source <!-- ⚠️ Note: where possible, please obtain 2 approvals prior to merging. Unless CODEOWNERS specifies otherwise, for external teams it is typically best to have one review from a team member, and one review from apm-dotnet. Trivial changes do not require 2 reviews. -->
1 parent 3fb67b0 commit abd12ae

11 files changed

+168
-810
lines changed

.azure-pipelines/ultimate-pipeline.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3909,19 +3909,6 @@ stages:
39093909
vmImage: ubuntu-latest
39103910
steps:
39113911
- checkout: none
3912-
- bash: |
3913-
echo "Creating dispatch event for https://github.com/DataDog/dd-trace-dotnet/actions/workflows/lib-injection.yml with ref=$(Build.SourceBranch) and azdo_build_id=$(Build.BuildId)"
3914-
curl \
3915-
-X POST \
3916-
-H "Accept: application/vnd.github+json" \
3917-
-H "Authorization: token $GITHUB_TOKEN"\
3918-
-H "X-GitHub-Api-Version: 2022-11-28" \
3919-
https://api.github.com/repos/DataDog/dd-trace-dotnet/actions/workflows/lib-injection.yml/dispatches \
3920-
-d '{"ref":"$(Build.SourceBranch)","inputs":{"azdo_build_id":"$(Build.BuildId)","is_latest":"$(isMainBranch)"}}'
3921-
displayName: Start lib-injection GitHub Actions worfklow
3922-
env:
3923-
GITHUB_TOKEN: $(GITHUB_TOKEN)
3924-
39253912
- bash: |
39263913
echo "Creating dispatch event for https://github.com/DataDog/dd-trace-dotnet/actions/workflows/create-system-test-docker-base-images.yml with ref=$(Build.SourceBranch) and azdo_build_id=$(Build.BuildId) and is_release_version=False"
39273914
curl \

.github/workflows/create_draft_release.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,7 @@ on:
88
required: false
99

1010
jobs:
11-
lib-injection-image-test:
12-
permissions:
13-
contents: read
14-
packages: write
15-
strategy:
16-
matrix:
17-
runtime: ['bullseye-slim','alpine']
18-
fail-fast: false
19-
uses: ./.github/workflows/lib-injection-test.yml
20-
with:
21-
commit_id: ${{ github.event.inputs.forced_commit_id || github.sha }}
22-
runtime: ${{ matrix.runtime }}
23-
secrets:
24-
DOCKER_REGISTRY_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25-
2611
create_draft_release:
27-
needs:
28-
- lib-injection-image-test
2912
runs-on: ubuntu-latest
3013
env:
3114
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/lib-injection-test.yml

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

.github/workflows/lib-injection.yml

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

0 commit comments

Comments
 (0)