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.

Sign up for GitHub

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

Jump to bottom

fix(ci): include complete as supported variant on merges #27572

Merged
merged 3 commits into from
Aug 26, 2021
Merged

fix(ci): include complete as supported variant on merges #27572

merged 3 commits into from
Aug 26, 2021

Conversation

mdelapenya
Copy link
Contributor

What does this PR do?

it includes complete variant as a supported variant when merge commits are packaged.

Why is it important?

The elastic-agent-complete image seems to override the regular image. See my comments on #27427 (comment)

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • [ ]

Related issues

@mdelapenya mdelapenya self-assigned this Aug 24, 2021
@mdelapenya mdelapenya added the Team:Automation Label for the Observability productivity team label Aug 24, 2021
@mdelapenya mdelapenya requested a review from a team August 24, 2021 15:56
@botelastic 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 24, 2021
@mdelapenya mdelapenya marked this pull request as ready for review August 24, 2021 16:02
@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 24, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-08-25T15:11:24.422+0000

  • Duration: 156 min 54 sec

  • Commit: b97907a

Test stats 🧪

Test Results
Failed 0
Passed 53621
Skipped 5324
Total 58945

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 53621
Skipped 5324
Total 58945

cachedout
cachedout reviewed Aug 25, 2021
View reviewed changes
Jenkinsfile Outdated Show resolved Hide resolved
@mdelapenya
Copy link
Contributor Author

I'd say the failures are not related to the changes in this PR, but described in #27585

@narph please let me know if it's OK to merge according to the flakiness

@narph
Copy link
Contributor

narph commented Aug 25, 2021

I'd say the failures are not related to the changes in this PR, but described in #27585

@narph please let me know if it's OK to merge according to the flakiness

I have opened issues for the flaky tests and suggest we skip the tests, PR created #27590.
The current PR changes look unrelated to the flaky tests, if this is an urgent change I would say go for it and merge, else please wait for the flaky test PR to be merged, rebase and retry.

@mdelapenya
Merge branch 'master' into fix-complete-packaging
b97907a 
* master:
  Skip Flaky Tests  (elastic#27590)
  Remove fargate from aws module config (elastic#27575)
  [Heartbeat] Fix scheduler job type limit algorithm (elastic#27559)
@mdelapenya mdelapenya added backport-v7.14.0 Automated backport with mergify backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify and removed backport-v7.14.0 Automated backport with mergify labels Aug 26, 2021
@mdelapenya mdelapenya merged commit 5937778 into elastic:master Aug 26, 2021
mergify bot pushed a commit that referenced this pull request Aug 26, 2021
@mdelapenya
fix(ci): include complete as supported variant on merges (#27572)
1ee1ddc 
* fix(ci): include complete as supported variant on merges

* chore: simplify

(cherry picked from commit 5937778)
@mergify mergify bot mentioned this pull request Aug 26, 2021
Merged
mergify bot pushed a commit that referenced this pull request Aug 26, 2021
@mdelapenya
fix(ci): include complete as supported variant on merges (#27572)
3450a95 
* fix(ci): include complete as supported variant on merges

* chore: simplify

(cherry picked from commit 5937778)
@mergify mergify bot mentioned this pull request Aug 26, 2021
Merged
@mdelapenya mdelapenya deleted the fix-complete-packaging branch August 26, 2021 10:08
mdelapenya added a commit that referenced this pull request Sep 14, 2021
@mergify @mdelapenya
fix(ci): include complete as supported variant on merges (#27572) (#2…
4388d22 
…7604)

* fix(ci): include complete as supported variant on merges

* chore: simplify

(cherry picked from commit 5937778)

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
mdelapenya added a commit that referenced this pull request Oct 19, 2021
@mergify @mdelapenya
fix(ci): include complete as supported variant on merges (#27572) (#2…
bce52a4 
…7605)

* fix(ci): include complete as supported variant on merges

* chore: simplify

(cherry picked from commit 5937778)

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
Icedroid pushed a commit to Icedroid/beats that referenced this pull request Nov 1, 2021
@mdelapenya
fix(ci): include complete as supported variant on merges (elastic#27572)
b5c0e19 
* fix(ci): include complete as supported variant on merges

* chore: simplify
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@v1v v1v v1v approved these changes

@cachedout cachedout cachedout approved these changes

Assignees

@mdelapenya mdelapenya

Labels
backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify Team:Automation Label for the Observability productivity team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mdelapenya @elasticmachine @narph @cachedout @v1v