fix: remove extra curly brace in script #21692

mdelapenya · 2020-10-08T15:39:15Z

What does this PR do?

It removes one extra curly brace added while reviewing #21621 directly on Github.

Why is it important?

Without this fix, the job does not compile (See https://beats-ci.elastic.co/blue/organizations/jenkins/Beats%2Fpackaging/detail/master/703/pipeline)

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

[ ]

How to test this PR locally

Related issues

Relates [CI: Packaging] fix: push ubi8 images too #21621

Logs

[2020-10-08T15:02:24.868Z] Obtained .ci/packaging.groovy from 5b69349d02b3fc92605ccfe796b6dd558fa18846
[2020-10-08T15:02:24.868Z] Resume disabled by user, switching to high-performance, low-durability mode.
[2020-10-08T15:02:24.903Z] org.codehaus.groovy.control.MultipleCompilationErrorsException: startup failed:
[2020-10-08T15:02:24.903Z] WorkflowScript: 226: unexpected token: } @ line 226, column 1.
[2020-10-08T15:02:24.903Z]    }
[2020-10-08T15:02:24.903Z]    ^
[2020-10-08T15:02:24.903Z] 
[2020-10-08T15:02:24.904Z] 1 error
[2020-10-08T15:02:24.904Z] 
[2020-10-08T15:02:24.904Z] 	at org.codehaus.groovy.control.ErrorCollector.failIfErrors(ErrorCollector.java:310)
[2020-10-08T15:02:24.904Z] 	at org.codehaus.groovy.control.ErrorCollector.addFatalError(ErrorCollector.java:150)
[2020-10-08T15:02:24.904Z] 	at org.codehaus.groovy.control.ErrorCollector.addError(ErrorCollector.java:120)
[2020-10-08T15:02:24.904Z] 	at org.codehaus.groovy.control.ErrorCollector.addError(ErrorCollector.java:132)
[2020-10-08T15:02:24.904Z] 	at org.codehaus.groovy.control.SourceUnit.addError(SourceUnit.java:350)
[2020-10-08T15:02:24.904Z] 	at org.codehaus.groovy.antlr.AntlrParserPlugin.transformCSTIntoAST(AntlrParserPlugin.java:144)
[2020-10-08T15:02:24.904Z] 	at org.codehaus.groovy.antlr.AntlrParserPlugin.parseCST(AntlrParserPlugin.java:110)
[2020-10-08T15:02:24.904Z] 	at org.codehaus.groovy.control.SourceUnit.parse(SourceUnit.java:234)
[2020-10-08T15:02:24.904Z] 	at org.codehaus.groovy.control.CompilationUnit$1.call(CompilationUnit.java:168)
[2020-10-08T15:02:24.904Z] 	at org.codehaus.groovy.control.CompilationUnit.applyToSourceUnits(CompilationUnit.java:943)
[2020-10-08T15:02:24.904Z] 	at org.codehaus.groovy.control.CompilationUnit.doPhaseOperation(CompilationUnit.java:605)
[2020-10-08T15:02:24.904Z] 	at org.codehaus.groovy.control.CompilationUnit.processPhaseOperations(CompilationUnit.java:581)
[2020-10-08T15:02:24.904Z] 	at org.codehaus.groovy.control.CompilationUnit.compile(CompilationUnit.java:558)
[2020-10-08T15:02:24.904Z] 	at groovy.lang.GroovyClassLoader.doParseClass(GroovyClassLoader.java:298)
[2020-10-08T15:02:24.904Z] 	at groovy.lang.GroovyClassLoader.parseClass(GroovyClassLoader.java:268)
[2020-10-08T15:02:24.904Z] 	at groovy.lang.GroovyShell.parseClass(GroovyShell.java:688)
[2020-10-08T15:02:24.904Z] 	at groovy.lang.GroovyShell.parse(GroovyShell.java:700)
[2020-10-08T15:02:24.904Z] 	at org.jenkinsci.plugins.workflow.cps.CpsGroovyShell.doParse(CpsGroovyShell.java:142)
[2020-10-08T15:02:24.904Z] 	at org.jenkinsci.plugins.workflow.cps.CpsGroovyShell.reparse(CpsGroovyShell.java:127)
[2020-10-08T15:02:24.904Z] 	at org.jenkinsci.plugins.workflow.cps.CpsFlowExecution.parseScript(CpsFlowExecution.java:561)
[2020-10-08T15:02:24.904Z] 	at org.jenkinsci.plugins.workflow.cps.CpsFlowExecution.start(CpsFlowExecution.java:522)
[2020-10-08T15:02:24.904Z] 	at org.jenkinsci.plugins.workflow.job.WorkflowRun.run(WorkflowRun.java:337)
[2020-10-08T15:02:24.904Z] 	at hudson.model.ResourceController.execute(ResourceController.java:97)
[2020-10-08T15:02:24.904Z] 	at hudson.model.Executor.run(Executor.java:428)
[2020-10-08T15:02:24.904Z] Finished: FAILURE

elasticmachine · 2020-10-08T16:07:58Z

💚 Build Succeeded

Expand to view the summary

Build stats

Build Cause: [Pull request #21692 opened]
Start Time: 2020-10-08T15:40:01.125+0000
Duration: 28 min 47 sec

* upstream/master: (127 commits) Update obs app links (elastic#21682) fix: update fleet test suite name (elastic#21738) Remove dot from file.extension value in Auditbeat FIM (elastic#21644) Fix leaks with metadata processors (elastic#16349) Add istiod metricset (elastic#21519) [Ingest Manager] Change Sync/Close call order (elastic#21735) [Ingest Manager] Syncing unpacked files (elastic#21706) Fix concurrent map read and write in socket dataset (elastic#21690) Fix conditional coding to remove seccomp info from Winlogbeat (elastic#21652) [Elastic Agent] Fix issue where inputs without processors defined would panic (elastic#21628) Add configuration of filestream input (elastic#21565) libbeat/logp: introduce Logger.WithOptions (elastic#21671) Make o365audit input cancellable (elastic#21647) fix: remove extra curly brace in script (elastic#21692) [Winlogbeat] Remove brittle configuration validation from wineventlog (elastic#21593) Fix function that parses from/to/contact headers (elastic#21672) [CI] Support Windows-2016 in pipeline 2.0 (elastic#21337) Skip publisher flaky tests (elastic#21657) backport: add 7.10 branch (elastic#21635) [CI: Packaging] fix: push ubi8 images too (elastic#21621) ...

* fix: remove extra curly brace * chore: proper indent

* feat: add a new step to run the e2e tests for certain parts of Beats (#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 <[email protected]> * chore: add BASE_DIR env variable Co-authored-by: Victor Martinez <[email protected]> * 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 <[email protected]> * [E2E Tests] fix: set versions ony for PRs (#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 <[email protected]> Co-authored-by: Victor Martinez <[email protected]> * [CI: Packaging] fix: push ubi8 images too (#21621) * 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]> * fix: remove extra curly brace in script (#21692) * fix: remove extra curly brace * chore: proper indent * fix: update fleet test suite name (#21738) * chore: create CI artifacts for DEV usage (#21645) It will create the artifacts with some requirements related to integrity * chore: simplify triggering the E2E tests for Beats (#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 (#21861) * 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]> * feat: package aliases for snapshots (#21960) * feat: push aliases for docker images * feat: build alias for snapshots * fix: only update alias on snapshots Co-authored-by: Jaime Soriano Pastor <[email protected]> * 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 <[email protected]> * chore: Use third number as x Co-authored-by: Victor Martinez <[email protected]> Co-authored-by: Jaime Soriano Pastor <[email protected]>

* feat: add a new step to run the e2e tests for certain parts of Beats (#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 <[email protected]> * chore: add BASE_DIR env variable Co-authored-by: Victor Martinez <[email protected]> * 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 <[email protected]> * [E2E Tests] fix: set versions ony for PRs (#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 <[email protected]> Co-authored-by: Victor Martinez <[email protected]> * [CI: Packaging] fix: push ubi8 images too (#21621) * 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]> * fix: remove extra curly brace in script (#21692) * fix: remove extra curly brace * chore: proper indent * fix: update fleet test suite name (#21738) * chore: create CI artifacts for DEV usage (#21645) It will create the artifacts with some requirements related to integrity * chore: simplify triggering the E2E tests for Beats (#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 (#21861) * 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]> # Conflicts: # .ci/packaging.groovy * feat: package aliases for snapshots (#21960) * feat: push aliases for docker images * feat: build alias for snapshots * fix: only update alias on snapshots Co-authored-by: Jaime Soriano Pastor <[email protected]> * 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 <[email protected]> * chore: Use third number as x Co-authored-by: Victor Martinez <[email protected]> Co-authored-by: Jaime Soriano Pastor <[email protected]>

* 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 <[email protected]> * chore: add BASE_DIR env variable Co-authored-by: Victor Martinez <[email protected]> * 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 <[email protected]> * [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 <[email protected]> Co-authored-by: Victor Martinez <[email protected]> * [CI: Packaging] fix: push ubi8 images too (elastic#21621) * 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]> * 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 <[email protected]> Co-authored-by: Victor Martinez <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * chore: Use third number as x Co-authored-by: Victor Martinez <[email protected]> Co-authored-by: Jaime Soriano Pastor <[email protected]> (cherry picked from commit 624c459)

…23142) 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) Co-authored-by: Victor Martinez <[email protected]> Co-authored-by: Manuel de la Peña <[email protected]>

…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 <[email protected]> Co-authored-by: Manuel de la Peña <[email protected]> (cherry picked from commit 1006bd9)

…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 <[email protected]> Co-authored-by: Manuel de la Peña <[email protected]>

* 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 <[email protected]> * chore: add BASE_DIR env variable Co-authored-by: Victor Martinez <[email protected]> * 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 <[email protected]> * [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 <[email protected]> Co-authored-by: Victor Martinez <[email protected]> * [CI: Packaging] fix: push ubi8 images too (elastic#21621) * 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]> * 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 <[email protected]> Co-authored-by: Victor Martinez <[email protected]> # Conflicts: # .ci/packaging.groovy * 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 <[email protected]> * 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 <[email protected]> * chore: Use third number as x Co-authored-by: Victor Martinez <[email protected]> Co-authored-by: Jaime Soriano Pastor <[email protected]>

mdelapenya added 2 commits October 8, 2020 17:36

fix: remove extra curly brace

3b1e5ba

chore: proper indent

48bd2b8

mdelapenya self-assigned this Oct 8, 2020

mdelapenya requested a review from a team October 8, 2020 15:39

botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 8, 2020

mdelapenya marked this pull request as ready for review October 8, 2020 15:40

mdelapenya added the Team:Automation Label for the Observability productivity team label Oct 8, 2020

botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 8, 2020

kuisathaverat approved these changes Oct 8, 2020

View reviewed changes

v1v approved these changes Oct 8, 2020

View reviewed changes

andresrc added the [zube]: Inbox label Oct 8, 2020

mdelapenya merged commit e4df450 into elastic:master Oct 8, 2020

zube bot added [zube]: Done and removed [zube]: Inbox labels Oct 8, 2020

mdelapenya deleted the fix-package-pipeline branch October 14, 2020 05:39

mdelapenya mentioned this pull request Oct 22, 2020

Cherry-pick to 7.10: packaging backports #22076

Merged

mdelapenya added a commit to mdelapenya/beats that referenced this pull request Oct 22, 2020

fix: remove extra curly brace in script (elastic#21692)

e48a728

* fix: remove extra curly brace * chore: proper indent

mdelapenya mentioned this pull request Oct 22, 2020

Cherry-pick to 7.9: packaging backports #22078

Merged

mdelapenya added a commit to mdelapenya/beats that referenced this pull request Oct 22, 2020

fix: remove extra curly brace in script (elastic#21692)

f5dfacb

* fix: remove extra curly brace * chore: proper indent

jsoriano mentioned this pull request Dec 15, 2020

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

Merged

zube bot removed the [zube]: Done label 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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: remove extra curly brace in script #21692

fix: remove extra curly brace in script #21692

Uh oh!

mdelapenya commented Oct 8, 2020 •

edited by zube bot

Loading

Uh oh!

elasticmachine commented Oct 8, 2020

Build stats

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

fix: remove extra curly brace in script #21692

fix: remove extra curly brace in script #21692

Uh oh!

Conversation

mdelapenya commented Oct 8, 2020 • edited by zube bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Why is it important?

Checklist

Author's Checklist

How to test this PR locally

Related issues

Logs

Uh oh!

elasticmachine commented Oct 8, 2020

💚 Build Succeeded

Build stats

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

mdelapenya commented Oct 8, 2020 •

edited by zube bot

Loading