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.

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

ci(dra): support qualifier for the main branch #15217

Merged
merged 8 commits into from
Jan 17, 2025
Merged

Conversation

v1v
Copy link
Member

@v1v v1v commented Jan 13, 2025

Motivation/summary

conduct a staging DRA upload from the main branch (we would usually use the 9.0 branch but will make an exception here) using “alpha1” as the qualifier.

Implementation details

  • The ELASTIC_QUALIFIER environment variable should be set when building/packaging the APM Server or using the BK DRA job if a qualifier needs to be used.
  • Use LDFLAGS to honour the ELASTIC_QUALIFIER value.
  • Replace version.Version references with version.VersionWithQualifier().

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

After merging it. However, a dry-run will happen in a feature branch but using the list commands instead of collect.

$ ELASTIC_QUALIFIER=alpha1 make package-snapshot
$ ELASTIC_QUALIFIER=alpha1 make apm-server
$ ./apm-server version
$ ls -ltra build/distributions

And also without ELASTIC_QUALIFIER=alpha1

$ make package-snapshot
$ make apm-server
$ ./apm-server version
$ ls -ltra build/distributions

For instance, I removed the docker generations and test package-snapshot:

 ls -ltra build/distributions 
total 407752
-rw-r--r--   1 vmartinez  staff  26128584 Jan 15 18:32 apm-server-9.0.0-alpha1-SNAPSHOT-darwin-x86_64.tar.gz
-rw-r--r--   1 vmartinez  staff  25964854 Jan 15 18:32 apm-server-9.0.0-alpha1-SNAPSHOT-linux-x86_64.tar.gz
-rw-r--r--   1 vmartinez  staff  24325940 Jan 15 18:32 apm-server-9.0.0-alpha1-SNAPSHOT-linux-arm64.tar.gz
-rw-r--r--   1 vmartinez  staff  26266940 Jan 15 18:33 apm-server-9.0.0-alpha1-SNAPSHOT-windows-x86_64.zip
-rw-r--r--   1 vmartinez  staff  26460610 Jan 15 18:33 apm-server-9.0.0-alpha1-SNAPSHOT-amd64.deb
-rw-r--r--   1 vmartinez  staff  24911010 Jan 15 18:33 apm-server-9.0.0-alpha1-SNAPSHOT-arm64.deb
-rw-r--r--   1 vmartinez  staff  27335740 Jan 15 18:33 apm-server-9.0.0-alpha1-SNAPSHOT-x86_64.rpm
drwxr-xr-x  10 vmartinez  staff       320 Jan 15 18:33 .
-rw-r--r--   1 vmartinez  staff  25626665 Jan 15 18:33 apm-server-9.0.0-alpha1-SNAPSHOT-aarch64.rpm
drwxr-xr-x  20 vmartinez  staff       640 Jan 15 18:34 ..

DRA

With a qualifier sets to alpha1, see this build
Without a qualifier, see this build

Related issues

@v1v v1v requested a review from a team as a code owner January 13, 2025 10:54
@v1v v1v self-assigned this Jan 13, 2025
@v1v v1v added automation Team:Automation Label for the Observability productivity team backport-8.x Automated backport to the 8.x branch with mergify labels Jan 13, 2025
@v1v v1v requested a review from a team January 13, 2025 10:56
@v1v v1v marked this pull request as draft January 13, 2025 11:31
v1v added 4 commits January 15, 2025 16:28
requires further changes in the go build command
.buildkite/scripts/dra.sh Outdated Show resolved Hide resolved
@v1v v1v marked this pull request as ready for review January 15, 2025 17:56
Makefile Outdated Show resolved Hide resolved
@v1v v1v requested a review from kruskall January 16, 2025 09:38
@v1v v1v merged commit a6cf66b into main Jan 17, 2025
13 checks passed
@v1v v1v deleted the feature/qualifier-main-alpha branch January 17, 2025 08:11
mergify bot pushed a commit that referenced this pull request Jan 17, 2025
mergify bot added a commit that referenced this pull request Jan 17, 2025
(cherry picked from commit a6cf66b)

Co-authored-by: Victor Martinez <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation backport-8.x Automated backport to the 8.x branch with mergify Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants