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

Backport some features in Jenkinsfile to 7.x #18040

Merged
merged 6 commits into from
Apr 28, 2020

Conversation

jsoriano
Copy link
Member

@jsoriano jsoriano commented Apr 28, 2020

Backport some features added to Jenkinsfile to 7.x branch:

  • Dry run option.
  • Docker login.
  • Git config for generator tests.
  • Filter changes using go list.

These are the cherry-picked changes:

Co-Authored-By: Ivan Fernandez Calvo kuisathaverat@users.noreply.github.com

kuisathaverat and others added 6 commits April 28, 2020 11:04
* fix: login into the docker registry

* test: make a pull after login to test

* docs: add note to the workaround
* feat: filter changes using go list output

* fix: auditbeat trigger
* fix: disable workaround on macos

* Update Jenkinsfile

Co-Authored-By: Victor Martinez <victormartinezrubio@gmail.com>

* Update Jenkinsfile

Co-Authored-By: Andrew Kroh <andrew.kroh@elastic.co>

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
* ci: set git user configuration if it is not set

* Apply suggestions from code review
* fix: mount Docker credentials

* Apply suggestions from code review

* Apply suggestions from code review
Fix dependency checking for generators, looking now for dependencies
of the generators code itself (beatgen) and Metricbeat beater.
Stop looking for dependencies of libbeat in all beats, this is redundant
as they are already transitive dependencies.
Run collection of dependecies in the host instead of using docker, what
is slightly faster.
@jsoriano jsoriano self-assigned this Apr 28, 2020
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 28, 2020
@jsoriano
Copy link
Member Author

After backporting these changes, the only differences between master and 7.x would be the packaging job, and the migration of Metricbeat to mage. The migration of Metricbeat is already being backported by @blakerouse in #17951.

@kuisathaverat @mikemadden42 should we also backport the packaging job? For that we should backport these changes:

684106e feat: trigger packaging after a succefull build on master (#17961)
f1ce8e1 Update Platform selector in packaging job (#17908)
914e6d3 feat: build packages in parallel (#17723)
eaa85cb feat: packaging pipeline (#17563)

For #17563 there is already a backport (#18001), should we include the other related fixes there?

@jsoriano jsoriano removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 28, 2020
@kuisathaverat
Copy link
Contributor

I have PRs for the packaging job, I will merge them
#18002
#18001

And I will close #17747 because you backport more changes here

@jsoriano
Copy link
Member Author

I have PRs for the packaging job, I will merge them
#18002
#18001

Oh, these include all the fixes, good then 👍 thanks!

@jsoriano jsoriano merged commit d6ce568 into elastic:7.x Apr 28, 2020
@jsoriano jsoriano deleted the cherry-pick-jenkinsfile branch April 28, 2020 14:56
@v1v v1v removed the [zube]: Done label Jun 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation ci review Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants