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

[E2E Tests] fix: set versions ony for PRs #21608

Merged
merged 2 commits into from
Oct 7, 2020

Conversation

mdelapenya
Copy link
Contributor

We want to use default versions per branch when running after a merge

What does this PR do?

It creates the parameters for the E2E tests build dynamically, which means: if it's a PR, it will use the snapshots created by the PR.

Why is it important?

It will use the default values for merge commits on Beats repo, triggering the job for the proper maintenance branch

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

We want to use default versions per branch when running after a merge
@mdelapenya mdelapenya self-assigned this Oct 7, 2020
@mdelapenya mdelapenya requested a review from a team October 7, 2020 07:58
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 7, 2020
@mdelapenya mdelapenya added the Team:Automation Label for the Observability productivity team label Oct 7, 2020
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 7, 2020
@mdelapenya mdelapenya changed the title fix: set versions ony for PRs [E2E Tests] fix: set versions ony for PRs Oct 7, 2020
.ci/packaging.groovy Outdated Show resolved Hide resolved
Co-authored-by: Victor Martinez <[email protected]>
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 7, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #21608 updated]

  • Start Time: 2020-10-07T08:22:02.656+0000

  • Duration: 26 min 57 sec

@mdelapenya mdelapenya marked this pull request as ready for review October 7, 2020 08:51
@mdelapenya mdelapenya merged commit 3e86c2a into elastic:master Oct 7, 2020
@mdelapenya mdelapenya deleted the set-project-versions branch October 7, 2020 11:03
v1v added a commit to v1v/beats that referenced this pull request Oct 8, 2020
…ci-build-label-support

* upstream/master: (60 commits)
  Skip publisher flaky tests (elastic#21657)
  backport: add 7.10 branch (elastic#21635)
  [CI: Packaging] fix: push ubi8 images too (elastic#21621)
  Docker build resiliance with a retry (elastic#21587)
  Fix flaky FSWatch/FSScanner tests (elastic#21625)
  chore: add versions 7.1x (elastic#21670)
  [Elastic Agent] Reload fleet.kibana.hosts from policy change (elastic#21599)
  Fix cyberark/corepas pipeline (elastic#21643)
  Add openstack ssl provider in add_cloud_metadata (elastic#21590)
  Add fips_enabled into all aws filesets (elastic#21626)
  [Filebeat S3] Change log.file.path to be nested object (elastic#21624)
  [CI] Change notification channel (elastic#21559)
  Add `add_observer_metadata` `geo.name` to Quickstart (elastic#21501)
  [E2E Tests] fix: set versions ony for PRs (elastic#21608)
  Fix badger build in 386 (elastic#21613)
  docs: Update timestamp.asciidoc (elastic#20395)
  Remove nil-zero metrics and linux-exclusive metrics from Metricbeat (elastic#21457)
  [Metricbeat] Use timestamp from CloudWatch for events (elastic#21498)
  [Filebeat][S3 Input] Add support for FIPS endpoints (elastic#21585)
  [Ingest Manager] Use new form of fleet API paths (elastic#21478)
  ...
v1v added a commit to v1v/beats that referenced this pull request Oct 8, 2020
…012-2.0

* upstream/master: (110 commits)
  Skip publisher flaky tests (elastic#21657)
  backport: add 7.10 branch (elastic#21635)
  [CI: Packaging] fix: push ubi8 images too (elastic#21621)
  Docker build resiliance with a retry (elastic#21587)
  Fix flaky FSWatch/FSScanner tests (elastic#21625)
  chore: add versions 7.1x (elastic#21670)
  [Elastic Agent] Reload fleet.kibana.hosts from policy change (elastic#21599)
  Fix cyberark/corepas pipeline (elastic#21643)
  Add openstack ssl provider in add_cloud_metadata (elastic#21590)
  Add fips_enabled into all aws filesets (elastic#21626)
  [Filebeat S3] Change log.file.path to be nested object (elastic#21624)
  [CI] Change notification channel (elastic#21559)
  Add `add_observer_metadata` `geo.name` to Quickstart (elastic#21501)
  [E2E Tests] fix: set versions ony for PRs (elastic#21608)
  Fix badger build in 386 (elastic#21613)
  docs: Update timestamp.asciidoc (elastic#20395)
  Remove nil-zero metrics and linux-exclusive metrics from Metricbeat (elastic#21457)
  [Metricbeat] Use timestamp from CloudWatch for events (elastic#21498)
  [Filebeat][S3 Input] Add support for FIPS endpoints (elastic#21585)
  [Ingest Manager] Use new form of fleet API paths (elastic#21478)
  ...
mdelapenya added a commit to mdelapenya/beats that referenced this pull request Oct 22, 2020
* 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]>
mdelapenya added a commit to mdelapenya/beats that referenced this pull request Oct 22, 2020
* 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]>
mdelapenya added a commit that referenced this pull request Oct 22, 2020
* 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]>
mdelapenya added a commit that referenced this pull request Oct 22, 2020
* 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]>
jsoriano pushed a commit to jsoriano/beats that referenced this pull request Dec 15, 2020
* 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)
jsoriano added a commit that referenced this pull request Jan 7, 2021
…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]>
jsoriano added a commit to jsoriano/beats that referenced this pull request Jan 7, 2021
…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)
jsoriano added a commit that referenced this pull request Jan 15, 2021
…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]>
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
* 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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants