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

Cherry-pick #21861 to 7.x: chore: delegate variant pushes to the right method #23124

Closed
wants to merge 2 commits into from

Conversation

jsoriano
Copy link
Member

@jsoriano jsoriano commented Dec 14, 2020

Cherry-pick of PR #21861 and #21621 to 7.x branch. Original message:

What does this PR do?

It groups the conditions for pushing the docker image of each beat, because the logic for the variants is responsible of pushing or logging a warning if the image exists.

Why is it important?

It won't push some of the images twice, also simplifying the IF/ELSE logic.

Apart from that, there are wrong image names after the addition of variants, like filebeat-oss-oss.

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

  • Groovy file validated

Related issues

* fix: delegate pushes to variants

* chore: group conditions for x-pack

* chore: simplify with endsWith

Co-authored-by: Victor Martinez <[email protected]>

Co-authored-by: Victor Martinez <[email protected]>
(cherry picked from commit e2f41f9c367c8d92b6ca5749f2cb7e4e08314593)
@jsoriano jsoriano added [zube]: In Review backport Team:Automation Label for the Observability productivity team labels Dec 14, 2020
@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 Dec 14, 2020
@jsoriano jsoriano requested a review from v1v December 14, 2020 20:35
@jsoriano
Copy link
Member Author

Trying to fix some issues with tag and push in 7.x branch. Like this one: https://beats-ci.elastic.co/blue/organizations/jenkins/Beats%2Fpackaging/detail/PR-23110/3/pipeline

[2020-12-14T18:11:52.857Z] + docker tag docker.elastic.co/beats/packetbeat:7.11.0-SNAPSHOT docker.elastic.co/observability-ci/packetbeat:pr-23110
[2020-12-14T18:11:52.857Z] Error response from daemon: No such image: docker.elastic.co/beats/packetbeat:7.11.0-SNAPSHOT script returned exit code 1

@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 14, 2020

💚 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

Expand to view the summary

Build stats

  • Build Cause: Pull request #23124 updated

  • Start Time: 2020-12-14T20:56:22.809+0000

  • Duration: 9 min 11 sec

❕ Flaky test report

No test was executed to be analysed.

@jsoriano
Copy link
Member Author

/package

@jsoriano
Copy link
Member Author

/packaging

* fix: push ubi8 images too

* chore: enhance retries

Co-authored-by: Victor Martinez <[email protected]>

* chore: use variables in log

* chore: add "-oss" images

Co-authored-by: Victor Martinez <[email protected]>
@jsoriano
Copy link
Member Author

jsoriano commented Dec 14, 2020

Cherry-picking #21621 too as it might be related.

@jsoriano
Copy link
Member Author

/packaging

@jsoriano
Copy link
Member Author

/package

1 similar comment
@jsoriano
Copy link
Member Author

/package

@jsoriano
Copy link
Member Author

Closing this in favour of #23142, that includes some changes that were backported to 7.10, but not to 7.x.

@jsoriano jsoriano closed this Dec 15, 2020
@zube zube bot removed the [zube]: Done label Mar 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants