Cherry-pick #22076 to 7.x: Cherry-pick to 7.10: packaging backports #23142

jsoriano · 2020-12-15T11:12:06Z

Cherry-pick of PR #22076 to 7.x branch. Original message:

Backports the following commits to 7.10:

feat: add a new step to run the e2e tests for certain parts of Beats (feat: add a new step to run the e2e tests for certain parts of Beats #21100)
[E2E Tests] fix: set versions ony for PRs ([E2E Tests] fix: set versions ony for PRs #21608)
[CI: Packaging] fix: push ubi8 images too ([CI: Packaging] fix: push ubi8 images too #21621)
fix: remove extra curly brace in script (fix: remove extra curly brace in script #21692)
fix: update fleet test suite name (fix: update fleet test suite name #21738)
chore: create CI artifacts for DEV usage (chore: create CI artifacts for DEV usage #21645)
chore: simplify triggering the E2E tests for Beats (chore: simplify triggering the E2E tests for Beats #21790)
chore: delegate variant pushes to the right method (chore: delegate variant pushes to the right method #21861)
feat: package aliases for snapshots (feat: package aliases for snapshots #21960)
fix: use proper param name for e2e tests (fix: use proper param name for e2e tests #22836)

* feat: add a new step to run the e2e tests for certain parts of Beats (elastic#21100) * feat: add a new step to run the e2e tests for certain parts of Beats We are going to trigger the tests for those parts affected by the elastic-agent, filebeat, or metricbeat, because those are the ones we verify in the e2e-testing suite * chore: do not include heartbeat * feat: trigger the e2e tests * fix: use relative path * chore: use proper target branch name for PRs * chore: use different tag * fix: use proper env variable * chore: pass github checks context to downstream job * chore: revert shared lib version Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com> * chore: add BASE_DIR env variable Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com> * chore: remove duplicated env * ffix: add param comma separator * fix: wrong copy&paste * chore: move e2e GH check out of the release context * chore: simplify conditional logic * chore: refine execution of test suites * fix: use proper parameter name * chore: set metricbeat version * chore: remove slack notifications on PRs * chore: update parameter * chore: run multiple test suites per beat type Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com> * [E2E Tests] fix: set versions ony for PRs (elastic#21608) * fix: set versions ony for PRs We want to use default versions per branch when running after a merge * fix: add trailing comma Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com> Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com> * [CI: Packaging] fix: push ubi8 images too (elastic#21621) * fix: push ubi8 images too * chore: enhance retries Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com> * chore: use variables in log * chore: add "-oss" images Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com> * fix: remove extra curly brace in script (elastic#21692) * fix: remove extra curly brace * chore: proper indent * fix: update fleet test suite name (elastic#21738) * chore: create CI artifacts for DEV usage (elastic#21645) It will create the artifacts with some requirements related to integrity * chore: simplify triggering the E2E tests for Beats (elastic#21790) * chore: pass beat as a method argument (no side-effects) * chore: run tests in a separate stage * fix: use parenthesis * chore: update comment * chore: do not trigger E2E tests if no suite was added * fix: use missing curly brackets * fix: wrong closure wrapping * fix: condition was not set * chore: delegate variant pushes to the right method (elastic#21861) * fix: delegate pushes to variants * chore: group conditions for x-pack * chore: simplify with endsWith Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com> Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com> * feat: package aliases for snapshots (elastic#21960) * feat: push aliases for docker images * feat: build alias for snapshots * fix: only update alias on snapshots Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co> * fix: wrong image name for alias * fix: reuse variable as groovy does not hide variables by scope * chore: extract common logic to a method * Revert "fix: only update alias on snapshots" This reverts commit cff2cef. * Revert "feat: build alias for snapshots" This reverts commit 707e0d7. * chore: do not push aliases for PRs Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co> * chore: Use third number as x Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com> Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co> (cherry picked from commit 624c459)

v1v · 2020-12-15T11:16:25Z

/packaging

elasticmachine · 2020-12-15T11:24:15Z

💚 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

Build Cause: Pull request #23142 updated
Start Time: 2021-01-05T14:52:54.643+0000
Duration: 10 min 39 sec

❕ Flaky test report

No test was executed to be analysed.

jsoriano · 2020-12-15T11:48:34Z

/package

jsoriano · 2020-12-15T17:47:02Z

@v1v I have added #22836 also here to see if it helps with E2E tests.

jsoriano · 2020-12-15T17:47:52Z

/package

jsoriano · 2020-12-16T10:09:58Z

@v1v do you think failures in E2E tests are related to this PR? 🤔

v1v · 2020-12-16T10:30:31Z

I'm not sure :_(

Maybe 7.x was not ready to use with these changes?

jsoriano · 2021-01-05T15:51:49Z

/packaging

jsoriano · 2021-01-05T16:13:14Z

/package

mdelapenya · 2021-01-07T05:08:18Z

@jsoriano, as we merged a potential fix for the E2E, I'm retriggering the E2E job for this PR, wait for results here: https://beats-ci.elastic.co/blue/organizations/jenkins/e2e-tests%2Fe2e-testing-mbp/detail/7.x/53/pipeline

mdelapenya · 2021-01-07T06:00:38Z

@jsoriano, as we merged a potential fix for the E2E, I'm retriggering the E2E job for this PR, wait for results here: https://beats-ci.elastic.co/blue/organizations/jenkins/e2e-tests%2Fe2e-testing-mbp/detail/7.x/53/pipeline

Tests are passing, although I found a corner case for the tests verifying the default config files for metricbeat. I'll open a ticket for that.

mdelapenya · 2021-01-07T10:31:59Z

@jsoriano next try once the fixes where merged in the e2e project. Follow the build here: https://beats-ci.elastic.co/blue/organizations/jenkins/e2e-tests%2Fe2e-testing-mbp/detail/7.x/56/pipeline

mdelapenya · 2021-01-07T13:57:44Z

@jsoriano this is good to merge 🎉 🚀

https://beats-ci.elastic.co/blue/organizations/jenkins/e2e-tests%2Fe2e-testing-mbp/detail/7.x/60/tests The only failure is a well-known flaky test. I also verified that the docker images used in tests correspond to the pr-23142 obtained from the CP bucket.

👍

…ports (elastic#23142) Backports the following commits to 7.x: * feat: add a new step to run the e2e tests for certain parts of Beats (elastic#21100) * [E2E Tests] fix: set versions ony for PRs (elastic#21608) * [CI: Packaging] fix: push ubi8 images too (elastic#21621) * fix: remove extra curly brace in script (elastic#21692) * fix: update fleet test suite name (elastic#21738) * chore: create CI artifacts for DEV usage (elastic#21645) * chore: simplify triggering the E2E tests for Beats (elastic#21790) * chore: delegate variant pushes to the right method (elastic#21861) * feat: package aliases for snapshots (elastic#21960) * fix: use proper param name for e2e tests (elastic#22836) Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com> Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com> (cherry picked from commit 1006bd9)

jsoriano · 2021-01-07T14:49:51Z

@mdelapenya merged, thanks! I have opened the backport to 7.11 #23396.

…23142) (#23396) Backports the following commits to 7.x: * feat: add a new step to run the e2e tests for certain parts of Beats (#21100) * [E2E Tests] fix: set versions ony for PRs (#21608) * [CI: Packaging] fix: push ubi8 images too (#21621) * fix: remove extra curly brace in script (#21692) * fix: update fleet test suite name (#21738) * chore: create CI artifacts for DEV usage (#21645) * chore: simplify triggering the E2E tests for Beats (#21790) * chore: delegate variant pushes to the right method (#21861) * feat: package aliases for snapshots (#21960) * fix: use proper param name for e2e tests (#22836) (cherry picked from commit 1006bd9) Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com> Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>

Commented-out by mistake in elastic#23142.

* Recover x-pack packetbeat build in packaging job, commented-out by mistake in #23142. * Enable x-pack/packetbeat in the CI (backport #22252) Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

jsoriano added [zube]: In Review backport Team:Automation Label for the Observability productivity team labels Dec 15, 2020

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 15, 2020

jsoriano requested a review from v1v December 15, 2020 11:12

jsoriano mentioned this pull request Dec 15, 2020

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

Closed

7 tasks

v1v approved these changes Dec 15, 2020

View reviewed changes

jsoriano self-assigned this Dec 15, 2020

mdelapenya and others added 2 commits December 15, 2020 18:43

fix: use proper param name for e2e tests (elastic#22836)

a08e0ee

Merge remote-tracking branch 'origin/7.x' into backport_22076_7.x

3c2bcbd

jsoriano added needs_backport PR is waiting to be backported to other branches. v7.11.0 labels Jan 5, 2021

Merge remote-tracking branch 'origin/7.x' into backport_22076_7.x

8b6a961

jsoriano requested a review from mdelapenya January 5, 2021 14:52

mdelapenya approved these changes Jan 5, 2021

View reviewed changes

mdelapenya mentioned this pull request Jan 5, 2021

fix: make docker namespace configurable elastic/e2e-testing#560

Merged

8 tasks

mdelapenya mentioned this pull request Jan 7, 2021

Metricbeat configuration tests are not using config files from Beats PRs elastic/e2e-testing#564

Closed

mdelapenya mentioned this pull request Jan 7, 2021

chore: rename variable for e2e tests #23382

Merged

6 tasks

jsoriano merged commit 1006bd9 into elastic:7.x Jan 7, 2021

jsoriano deleted the backport_22076_7.x branch January 7, 2021 14:48

zube bot added [zube]: Done and removed [zube]: In Review labels Jan 7, 2021

jsoriano mentioned this pull request Jan 7, 2021

Cherry-pick #23142 to 7.11: Cherry-pick #22076 to 7.x: Cherry-pick to 7.10: packaging backports #23396

Merged

jsoriano removed the needs_backport PR is waiting to be backported to other branches. label Jan 7, 2021

jsoriano added a commit to jsoriano/beats that referenced this pull request Jan 15, 2021

Recover x-pack packetbeat build in packaging job

5b3cd51

Commented-out by mistake in elastic#23142.

jsoriano mentioned this pull request Jan 15, 2021

Recover x-pack Packetbeat packaging in 7.x #23538

Merged

zube bot removed the [zube]: Done label Apr 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cherry-pick #22076 to 7.x: Cherry-pick to 7.10: packaging backports #23142

Cherry-pick #22076 to 7.x: Cherry-pick to 7.10: packaging backports #23142

jsoriano commented Dec 15, 2020 •

edited by zube bot

Loading

v1v commented Dec 15, 2020

elasticmachine commented Dec 15, 2020 •

edited by jenkins-beats-ci bot

Loading

Build stats

jsoriano commented Dec 15, 2020

jsoriano commented Dec 15, 2020

jsoriano commented Dec 15, 2020

jsoriano commented Dec 16, 2020

v1v commented Dec 16, 2020

jsoriano commented Jan 5, 2021

jsoriano commented Jan 5, 2021

mdelapenya commented Jan 7, 2021 •

edited

Loading

mdelapenya commented Jan 7, 2021

mdelapenya commented Jan 7, 2021

mdelapenya commented Jan 7, 2021 •

edited

Loading

jsoriano commented Jan 7, 2021

Cherry-pick #22076 to 7.x: Cherry-pick to 7.10: packaging backports #23142

Cherry-pick #22076 to 7.x: Cherry-pick to 7.10: packaging backports #23142

Conversation

jsoriano commented Dec 15, 2020 • edited by zube bot Loading

v1v commented Dec 15, 2020

elasticmachine commented Dec 15, 2020 • edited by jenkins-beats-ci bot Loading

💚 Build Succeeded

Build stats

❕ Flaky test report

jsoriano commented Dec 15, 2020

jsoriano commented Dec 15, 2020

jsoriano commented Dec 15, 2020

jsoriano commented Dec 16, 2020

v1v commented Dec 16, 2020

jsoriano commented Jan 5, 2021

jsoriano commented Jan 5, 2021

mdelapenya commented Jan 7, 2021 • edited Loading

mdelapenya commented Jan 7, 2021

mdelapenya commented Jan 7, 2021

mdelapenya commented Jan 7, 2021 • edited Loading

jsoriano commented Jan 7, 2021

jsoriano commented Dec 15, 2020 •

edited by zube bot

Loading

elasticmachine commented Dec 15, 2020 •

edited by jenkins-beats-ci bot

Loading

mdelapenya commented Jan 7, 2021 •

edited

Loading

mdelapenya commented Jan 7, 2021 •

edited

Loading