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

chore: upload files to Google Storage when they exist #28836

Merged
merged 3 commits into from
Nov 5, 2021
Merged

chore: upload files to Google Storage when they exist #28836

merged 3 commits into from
Nov 5, 2021

Conversation

mdelapenya
Copy link
Contributor

@mdelapenya mdelapenya commented Nov 5, 2021 •
edited
Loading

What does this PR do?

This PR does two things:

  1. it forces the CMD command for mage packageSystemTests to return 0 even though an error occurred.
  2. it uploads to Google only when the list of files has entries.

Why is it important?

For the return status, we are preventing the catchError pipeline block to continue on failures. And for the google upload step, protected by an IF clause, we are preventing trying to upload when there aren't files to upload.

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.

Related issues

@mdelapenya mdelapenya requested a review from a team as a code owner November 5, 2021 10:43
@mdelapenya mdelapenya added Team:Automation Label for the Observability productivity team backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify backport-v8.0.0 Automated backport with mergify labels Nov 5, 2021
@mdelapenya mdelapenya self-assigned this Nov 5, 2021
@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 Nov 5, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 5, 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-11-05T10:45:21.911+0000

  • Duration: 110 min 55 sec

  • Commit: ea30ef7

Test stats 🧪

Test Results
Failed 0
Passed 54120
Skipped 5354
Total 59474

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

@mdelapenya mdelapenya merged commit 20d637e into elastic:master Nov 5, 2021
mergify bot pushed a commit that referenced this pull request Nov 5, 2021
@mdelapenya
chore: upload files to Google Storage when they exist (#28836)
8f2e375 
* fix: send to Google Storage when there are files

* fix: prevent failures if mage exits with 1

* fix: define variable properly

(cherry picked from commit 20d637e)
@mergify mergify bot mentioned this pull request Nov 5, 2021
Merged
mergify bot pushed a commit that referenced this pull request Nov 5, 2021
@mdelapenya
chore: upload files to Google Storage when they exist (#28836)
25a9c40 
* fix: send to Google Storage when there are files

* fix: prevent failures if mage exits with 1

* fix: define variable properly

(cherry picked from commit 20d637e)
@mergify mergify bot mentioned this pull request Nov 5, 2021
Merged
mergify bot pushed a commit that referenced this pull request Nov 5, 2021
@mdelapenya
chore: upload files to Google Storage when they exist (#28836)
64ab2b7 
* fix: send to Google Storage when there are files

* fix: prevent failures if mage exits with 1

* fix: define variable properly

(cherry picked from commit 20d637e)
@mergify mergify bot mentioned this pull request Nov 5, 2021
Merged
mdelapenya added a commit that referenced this pull request Nov 5, 2021
@mergify @mdelapenya
chore: upload files to Google Storage when they exist (#28836) (#28847)
e4ff918 
* fix: send to Google Storage when there are files

* fix: prevent failures if mage exits with 1

* fix: define variable properly

(cherry picked from commit 20d637e)

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
mdelapenya added a commit that referenced this pull request Nov 5, 2021
@mergify @mdelapenya
chore: upload files to Google Storage when they exist (#28836) (#28846)
693f41c 
* fix: send to Google Storage when there are files

* fix: prevent failures if mage exits with 1

* fix: define variable properly

(cherry picked from commit 20d637e)

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
mdelapenya added a commit that referenced this pull request Nov 5, 2021
@mergify @mdelapenya
chore: upload files to Google Storage when they exist (#28836) (#28845)
4e93a98 
* fix: send to Google Storage when there are files

* fix: prevent failures if mage exits with 1

* fix: define variable properly

(cherry picked from commit 20d637e)

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
v1v added a commit to v1v/beats that referenced this pull request Nov 8, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/use-arch-…
3afea6c 
…in-the-package-binareis

* upstream/master:
  allows disable pod events enrichment with deployment name (elastic#28521)
  Remove Docker input from Filebeat (elastic#28817)
  [breaking] Make default_field: false the default for all fields (elastic#28596)
  Osquerybeat: Improve osquery client connect code (elastic#28848)
  Add crawler  metrics into the stats metricset for Enterprise Search (elastic#28790)
  Remove the now deprecated appsearch module from metricbeat (elastic#28850)
  Remove Beat generators (elastic#28816)
  chore: upload files to Google Storage when they exist (elastic#28836)
  Revert "chore(ci): disable E2E tests in Beats (elastic#28715)" (elastic#28812)
  Deprecate generating custom Beats (elastic#28814)
  [Metricbeat] upgrade flatbuffers to 1.12.1 (elastic#28094)
  Osquerybeat: Fix restart flags after previously bad config (elastic#28827)
  Force ECS and JSON logging for libbeat/logp (elastic#28573)
  Filebeat: Error on startup for unconfigured module (elastic#28818)
  Deprecate log input in favour of filestream (elastic#28623)
  Fix some spelling mistakes (elastic#28080)
@mdelapenya mdelapenya deleted the package-integ-tests branch November 8, 2021 19:05
@mdelapenya mdelapenya mentioned this pull request Nov 8, 2021
Merged
6 tasks
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@v1v
Merge remote-tracking branch 'upstream/master' into feature/use-arch-…
061692b 
…in-the-package-binareis

* upstream/master:
  allows disable pod events enrichment with deployment name (elastic#28521)
  Remove Docker input from Filebeat (elastic#28817)
  [breaking] Make default_field: false the default for all fields (elastic#28596)
  Osquerybeat: Improve osquery client connect code (elastic#28848)
  Add crawler  metrics into the stats metricset for Enterprise Search (elastic#28790)
  Remove the now deprecated appsearch module from metricbeat (elastic#28850)
  Remove Beat generators (elastic#28816)
  chore: upload files to Google Storage when they exist (elastic#28836)
  Revert "chore(ci): disable E2E tests in Beats (elastic#28715)" (elastic#28812)
  Deprecate generating custom Beats (elastic#28814)
  [Metricbeat] upgrade flatbuffers to 1.12.1 (elastic#28094)
  Osquerybeat: Fix restart flags after previously bad config (elastic#28827)
  Force ECS and JSON logging for libbeat/logp (elastic#28573)
  Filebeat: Error on startup for unconfigured module (elastic#28818)
  Deprecate log input in favour of filestream (elastic#28623)
  Fix some spelling mistakes (elastic#28080)
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@mergify @mdelapenya
chore: upload files to Google Storage when they exist (elastic#28836) (…
7c85f4e 
…elastic#28845)

* fix: send to Google Storage when there are files

* fix: prevent failures if mage exits with 1

* fix: define variable properly

(cherry picked from commit ea6445a)

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kuisathaverat kuisathaverat kuisathaverat approved these changes

@v1v v1v v1v approved these changes

Assignees

@mdelapenya mdelapenya

Labels
backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify backport-v8.0.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.
4 participants
@mdelapenya @elasticmachine @v1v @kuisathaverat