[elastic-agent] Fix docker tar.gz generation for complete image #27621

andrewvc · 2021-08-27T00:58:32Z

This interpolates the variant into the format string for .tar.gz docker artifacts. In also correctly handles the case where the format string is used in contexts without variant present, such as darwin. We still need an empty value for the templating language not to error.

Fixes #27608

This interpolates the `variant` into the format string for .tar.gz docker artifacts. In also correctly handles the case where the format string is used in contexts without variant present, such as darwin. We still need an empty value for the templating language not to error. Fixes elastic#27608

elasticmachine · 2021-08-27T00:58:34Z

Pinging @elastic/uptime (Team:Uptime)

elasticmachine · 2021-08-27T03:39:17Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2021-08-27T00:58:47.572+0000
Duration: 159 min 20 sec
Commit: 6099491

Test stats 🧪

Test	Results
Failed	0
Passed	53711
Skipped	5324
Total	59035

Trends 🧪

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test	Results
Failed	0
Passed	53711
Skipped	5324
Total	59035

vigneshshanmugam

LGTM

mdelapenya · 2021-08-27T05:41:30Z

Will this supersede #27609 ?

andrewvc · 2021-08-27T14:45:42Z

I didn't realize that PR existed, but given that this patch works, has passed CI (where the other one hasn't) I move that we move forward with this one.

mdelapenya

I didn't realize that PR existed, but given that this patch works, has passed CI (where the other one hasn't) I move that we move forward with this one.

Makes sense. LGTM

I'd like to know @jsoriano's and @kvch's review as build domain experts for the other PR (#27609) for the sake of completeness

andrewvc · 2021-08-30T12:41:44Z

@Mergifyio backport 7.x

(cherry picked from commit 89e415d)

mergify · 2021-08-30T12:42:12Z

Command backport 7.x: success

Backports have been created

#27640 [elastic-agent] Fix docker tar.gz generation for complete image (backport #27621) has been created for branch 7.x

andrewvc · 2021-08-30T12:42:21Z

@Mergifyio backport 7.15

(cherry picked from commit 89e415d)

mergify · 2021-08-30T12:42:51Z

Command backport 7.15: success

Backports have been created

#27641 [elastic-agent] Fix docker tar.gz generation for complete image (backport #27621) has been created for branch 7.15

…) (#27641) (cherry picked from commit 89e415d) Co-authored-by: Andrew Cholakian <[email protected]>

…) (#27640) (cherry picked from commit 89e415d) Co-authored-by: Andrew Cholakian <[email protected]>

* master: Forward port 7.14.1 changelog to master (elastic#27687) Addressing multiple dashboard issues: deps loading once, field conversion, etc. (elastic#27669) Remove adaptive queue sizes from agent's spec files (elastic#27653) Osquerybeat: Improve testability and unit test coverage (elastic#27591) Osquerybeat: lockdown flagsfile, prevent global defaults (elastic#27611) Import the references of dashboard assets using the Saved Objects API (elastic#27647) Fix bug with override path in cgroups (elastic#27620) Allow Kibana client to authorize with Elasticsearch API key (elastic#27540) Filebeat auditd: Fix Top Exec Commands dashboard visualization (elastic#27638) [elastic-agent] Fix docker tar.gz generation for complete image (elastic#27621) Follow up changes in dashboards in mage check && fix minor issue (elastic#27553) [Heartbeat] Fix bug where `enabled: false` is ignored. (elastic#27615) Support kube_state_metrics v2.0.0 (elastic#27552)

…ge (elastic#27621)" This reverts commit 89e415d.

…28526) * Revert "[elastic-agent] Fix docker tar.gz generation for complete image (#27621)" This reverts commit 89e415d. * Revert "[elastic-agent] Use -complete in docker image name, not tag (#27399)" This reverts commit 954a250. * chore: use declarative variant for complete * fix: pass agent dockerfile to complete spec * fix: do not append variant to the artifact name * docs: update reference to complete variant * chore: remove unused param * chore: remove Variants from PacakgeSpec struct As we prefer using the declarative way over the programmatic way, we do not need the variable. Instead, we'll use the YAML file for declaring the new variants * fix: align comment Co-authored-by: Jaime Soriano Pastor <[email protected]> Co-authored-by: Jaime Soriano Pastor <[email protected]>

…28526) * Revert "[elastic-agent] Fix docker tar.gz generation for complete image (#27621)" This reverts commit 89e415d. * Revert "[elastic-agent] Use -complete in docker image name, not tag (#27399)" This reverts commit 954a250. * chore: use declarative variant for complete * fix: pass agent dockerfile to complete spec * fix: do not append variant to the artifact name * docs: update reference to complete variant * chore: remove unused param * chore: remove Variants from PacakgeSpec struct As we prefer using the declarative way over the programmatic way, we do not need the variable. Instead, we'll use the YAML file for declaring the new variants * fix: align comment Co-authored-by: Jaime Soriano Pastor <[email protected]> Co-authored-by: Jaime Soriano Pastor <[email protected]> (cherry picked from commit 554399a) # Conflicts: # dev-tools/packaging/packages.yml # dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl

…28526) * Revert "[elastic-agent] Fix docker tar.gz generation for complete image (#27621)" This reverts commit 89e415d. * Revert "[elastic-agent] Use -complete in docker image name, not tag (#27399)" This reverts commit 954a250. * chore: use declarative variant for complete * fix: pass agent dockerfile to complete spec * fix: do not append variant to the artifact name * docs: update reference to complete variant * chore: remove unused param * chore: remove Variants from PacakgeSpec struct As we prefer using the declarative way over the programmatic way, we do not need the variable. Instead, we'll use the YAML file for declaring the new variants * fix: align comment Co-authored-by: Jaime Soriano Pastor <[email protected]> Co-authored-by: Jaime Soriano Pastor <[email protected]> (cherry picked from commit 554399a) # Conflicts: # dev-tools/packaging/packages.yml

…tic#27621)

…lastic#28526) * Revert "[elastic-agent] Fix docker tar.gz generation for complete image (elastic#27621)" This reverts commit 89e415d. * Revert "[elastic-agent] Use -complete in docker image name, not tag (elastic#27399)" This reverts commit 954a250. * chore: use declarative variant for complete * fix: pass agent dockerfile to complete spec * fix: do not append variant to the artifact name * docs: update reference to complete variant * chore: remove unused param * chore: remove Variants from PacakgeSpec struct As we prefer using the declarative way over the programmatic way, we do not need the variable. Instead, we'll use the YAML file for declaring the new variants * fix: align comment Co-authored-by: Jaime Soriano Pastor <[email protected]> Co-authored-by: Jaime Soriano Pastor <[email protected]>

…nt of the elastic-agent (#28635) * fix: use declarative style for complete variant of the elastic-agent (#28526) * Revert "[elastic-agent] Fix docker tar.gz generation for complete image (#27621)" This reverts commit 89e415d. * Revert "[elastic-agent] Use -complete in docker image name, not tag (#27399)" This reverts commit 954a250. * chore: use declarative variant for complete * fix: pass agent dockerfile to complete spec * fix: do not append variant to the artifact name * docs: update reference to complete variant * chore: remove unused param * chore: remove Variants from PacakgeSpec struct As we prefer using the declarative way over the programmatic way, we do not need the variable. Instead, we'll use the YAML file for declaring the new variants * fix: align comment Co-authored-by: Jaime Soriano Pastor <[email protected]> Co-authored-by: Jaime Soriano Pastor <[email protected]> (cherry picked from commit 554399a) # Conflicts: # dev-tools/packaging/packages.yml * fix: resolve conflicts in packages.yml file Co-authored-by: Manuel de la Peña <[email protected]>

andrewvc added bug Packaging Team:obs-ds-hosted-services Label for the Observability Hosted Services team v7.15.0 labels Aug 27, 2021

andrewvc requested review from v1v and vigneshshanmugam August 27, 2021 00:58

andrewvc self-assigned this Aug 27, 2021

botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Aug 27, 2021

andrewvc mentioned this pull request Aug 27, 2021

Complete variant for the elastic agent is not generating the right binaries #27608

Closed

andrewvc requested a review from mdelapenya August 27, 2021 00:59

vigneshshanmugam approved these changes Aug 27, 2021

View reviewed changes

mdelapenya approved these changes Aug 30, 2021

View reviewed changes

mdelapenya requested review from kvch and jsoriano August 30, 2021 05:56

andrewvc merged commit 89e415d into elastic:master Aug 30, 2021

mergify bot pushed a commit that referenced this pull request Aug 30, 2021

[elastic-agent] Fix docker tar.gz generation for complete image (#27621)

147fa5e

(cherry picked from commit 89e415d)

mergify bot mentioned this pull request Aug 30, 2021

[elastic-agent] Fix docker tar.gz generation for complete image (backport #27621) #27640

Merged

mergify bot pushed a commit that referenced this pull request Aug 30, 2021

[elastic-agent] Fix docker tar.gz generation for complete image (#27621)

82289fa

(cherry picked from commit 89e415d)

mergify bot mentioned this pull request Aug 30, 2021

[elastic-agent] Fix docker tar.gz generation for complete image (backport #27621) #27641

Merged

andrewvc deleted the fix-docker-variants branch August 30, 2021 13:58

andrewvc added a commit that referenced this pull request Aug 30, 2021

[elastic-agent] Fix docker tar.gz generation for complete image (#27621…

f1ce5fd

…) (#27641) (cherry picked from commit 89e415d) Co-authored-by: Andrew Cholakian <[email protected]>

mdelapenya mentioned this pull request Aug 30, 2021

fix: generate complete variant binaries properly #27609

Closed

9 tasks

andrewvc added a commit that referenced this pull request Aug 30, 2021

[elastic-agent] Fix docker tar.gz generation for complete image (#27621…

73d298c

…) (#27640) (cherry picked from commit 89e415d) Co-authored-by: Andrew Cholakian <[email protected]>

mdelapenya mentioned this pull request Oct 19, 2021

fix: use declarative style for complete variant of the elastic-agent #28526

Merged

6 tasks

mdelapenya added a commit to mdelapenya/beats that referenced this pull request Oct 19, 2021

Revert "[elastic-agent] Fix docker tar.gz generation for complete ima…

08c6c20

…ge (elastic#27621)" This reverts commit 89e415d.

Icedroid pushed a commit to Icedroid/beats that referenced this pull request Nov 1, 2021

[elastic-agent] Fix docker tar.gz generation for complete image (elas…

bcaaa33

…tic#27621)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[elastic-agent] Fix docker tar.gz generation for complete image #27621

[elastic-agent] Fix docker tar.gz generation for complete image #27621

andrewvc commented Aug 27, 2021

elasticmachine commented Aug 27, 2021

elasticmachine commented Aug 27, 2021

Build stats

Test stats 🧪

Trends 🧪

Test stats 🧪

vigneshshanmugam left a comment

mdelapenya commented Aug 27, 2021

andrewvc commented Aug 27, 2021

mdelapenya left a comment

andrewvc commented Aug 30, 2021

mergify bot commented Aug 30, 2021

andrewvc commented Aug 30, 2021

mergify bot commented Aug 30, 2021

[elastic-agent] Fix docker tar.gz generation for complete image #27621

[elastic-agent] Fix docker tar.gz generation for complete image #27621

Conversation

andrewvc commented Aug 27, 2021

elasticmachine commented Aug 27, 2021

elasticmachine commented Aug 27, 2021

💚 Build Succeeded

Build stats

Test stats 🧪

Trends 🧪

💚 Flaky test report

Test stats 🧪

vigneshshanmugam left a comment

Choose a reason for hiding this comment

mdelapenya commented Aug 27, 2021

andrewvc commented Aug 27, 2021

mdelapenya left a comment

Choose a reason for hiding this comment

andrewvc commented Aug 30, 2021

mergify bot commented Aug 30, 2021

andrewvc commented Aug 30, 2021

mergify bot commented Aug 30, 2021