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

Packaging: Ensure upgrade_is_oss flag file is always deleted #30732

Merged
merged 3 commits into from
May 24, 2018
Merged

Packaging: Ensure upgrade_is_oss flag file is always deleted #30732

merged 3 commits into from
May 24, 2018

Conversation

rjernst
Copy link
Member

@rjernst rjernst commented May 18, 2018

This commit ensures the delete of the upgrade_is_oss indicator for
the packaging tests is always deleted before each run. It works by
moving the check on version which skips the task into the doFirst block,
replacing the onlyIf.

closes #30682

@rjernst
Build: Ensure upgrade_is_oss flag file is always deleted
2daf608 
This commit ensures the delete of the upgrade_is_oss indicator for
the packaging tests is always deleted before each run. It works by
moving the check on version which skips the task into the doFirst block,
replacing the onlyIf.

closes elastic#30682
@rjernst rjernst added >test Issues or PRs that are addressing/adding tests :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts v7.0.0 v6.4.0 v6.3.1 labels May 18, 2018
@rjernst rjernst requested a review from alpar-t May 18, 2018 15:30
@rjernst rjernst mentioned this pull request May 18, 2018
Closed
alpar-t
alpar-t approved these changes May 21, 2018
View reviewed changes
Copy link
Contributor

@alpar-t alpar-t left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.
Might be worth adding some logging so one can tell what happened. With onlyif the task would be marked with SKIPPED but that's no longer the case with StopExecutionException. One can easily be mislead when readin task output / build log, as the task name does not convey the conditional on it's own.

@hub-cap hub-cap added :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts and removed :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts labels May 21, 2018
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra

@rjernst
Copy link
Member Author

rjernst commented May 22, 2018

Thanks @atorok. I added a message to the StopExcecutionException, which is printed at info level.

@rjernst rjernst merged commit 2c7559c into elastic:master May 24, 2018
@rjernst rjernst deleted the packaging_tests_oss_flag branch May 24, 2018 06:20
rjernst added a commit that referenced this pull request May 24, 2018
@rjernst
Packaging: Ensure upgrade_is_oss flag file is always deleted (#30732)
0380d93 
This commit ensures the delete of the upgrade_is_oss indicator for
the packaging tests is always deleted before each run. It works by
moving the check on version which skips the task into the doFirst block,
replacing the onlyIf.

closes #30682
rjernst added a commit that referenced this pull request May 24, 2018
@rjernst
Packaging: Ensure upgrade_is_oss flag file is always deleted (#30732)
947aae6 
This commit ensures the delete of the upgrade_is_oss indicator for
the packaging tests is always deleted before each run. It works by
moving the check on version which skips the task into the doFirst block,
replacing the onlyIf.

closes #30682
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request May 24, 2018
@jasontedor
Merge branch 'master' into verify-official-plugin-signature
9d40715 
* master:
  Update the version checks around ip_range bucket keys, now that the change was backported.
  Mute IndexMasterFailoverIT.testMasterFailoverDuringIndexingWithMappingChanges
  Use geohash cell instead of just a corner in geo_bounding_box (elastic#30698)
  Limit user to single concurrent auth per realm (elastic#30794)
  [Tests] Move templated _rank_eval tests (elastic#30679)
  Security: fix dynamic mapping updates with aliases (elastic#30787)
  Ensure that ip_range aggregations always return bucket keys. (elastic#30701)
  Use remote client in TransportFieldCapsAction (elastic#30838)
  Move Watcher versioning setting to meta field (elastic#30832)
  [Docs] Explain incomplete dates in range queries (elastic#30689)
  Move persistent task registrations to core (elastic#30755)
  Decouple ClusterStateTaskListener & ClusterApplier (elastic#30809)
  Send client headers from TransportClient (elastic#30803)
  Packaging: Ensure upgrade_is_oss flag file is always deleted (elastic#30732)
  Force stable file modes for built packages (elastic#30823)
  [DOCS] Fixes typos in security settings
  Fix GeoShapeQueryBuilder serialization after backport
martijnvg added a commit that referenced this pull request May 25, 2018
@martijnvg
Merge remote-tracking branch 'es/master' into ccr
e6dd414 
* es/master:
  Move score script context from SearchScript to its own class (#30816)
  Fix bad version check writing Repository nodes (#30846)
  [docs] explainer for java packaging tests (#30825)
  Remove Throwable usage from transport modules (#30845)
  REST high-level client: add put ingest pipeline API (#30793)
  Update the version checks around ip_range bucket keys, now that the change was backported.
  Mute IndexMasterFailoverIT.testMasterFailoverDuringIndexingWithMappingChanges
  Use geohash cell instead of just a corner in geo_bounding_box (#30698)
  Limit user to single concurrent auth per realm (#30794)
  [Tests] Move templated _rank_eval tests (#30679)
  Security: fix dynamic mapping updates with aliases (#30787)
  Ensure that ip_range aggregations always return bucket keys. (#30701)
  Use remote client in TransportFieldCapsAction (#30838)
  Move Watcher versioning setting to meta field (#30832)
  [Docs] Explain incomplete dates in range queries (#30689)
  Move persistent task registrations to core (#30755)
  Decouple ClusterStateTaskListener & ClusterApplier (#30809)
  Send client headers from TransportClient (#30803)
  Packaging: Ensure upgrade_is_oss flag file is always deleted (#30732)
  Force stable file modes for built packages (#30823)
martijnvg added a commit that referenced this pull request May 25, 2018
@martijnvg
Merge remote-tracking branch 'es/6.x' into ccr-6.x
545ed87 
* es/6.x:
  Move score script context from SearchScript to its own class (#30816)
  Fix bad version check writing Repository nodes (#30846)
  Modify state of VerifyRepositoryResponse for bwc (#30762)
  QA: Fix tribe tests when running default zip
  Use remote client in TransportFieldCapsAction (#30838)
  Mute IndexMasterFailoverIT.testMasterFailoverDuringIndexingWithMappingChanges
  Ensure that ip_range aggregations always return bucket keys. (#30701)
  Limit user to single concurrent auth per realm (#30794)
  Security: fix dynamic mapping updates with aliases (#30787)
  [Tests] Move templated _rank_eval tests (#30679)
  Move Watcher versioning setting to meta field (#30832)
  Restore "Add more yaml tests for get alias API " (#30814)
  Send client headers from TransportClient (#30803)
  [Docs] Explain incomplete dates in range queries (#30689)
  Move persistent task registrations to core (#30755)
  Decouple ClusterStateTaskListener & ClusterApplier (#30809)
  Packaging: Ensure upgrade_is_oss flag file is always deleted (#30732)
  Force stable file modes for built packages (#30823)
@jpountz
Copy link
Contributor

jpountz commented Jun 13, 2018

@rjernst the backport_pending label doesn't seem useful as it seems like this change was backported already?

@jpountz jpountz added v6.3.0 and removed v6.3.1 labels Jun 13, 2018
@rjernst
Copy link
Member Author

rjernst commented Jun 18, 2018

@jpountz I simply forgot to remove once I finished the backport. I wasn't sure if I would get it in that day and didn't want to forget.

@jpountz
Copy link
Contributor

jpountz commented Jun 18, 2018

@rjernst Thanks for checking.

@mark-vieira mark-vieira added the Team:Delivery Meta label for Delivery team label Nov 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alpar-t alpar-t alpar-t approved these changes

Assignees
No one assigned
Labels
:Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts Team:Delivery Meta label for Delivery team >test Issues or PRs that are addressing/adding tests v6.3.0 v6.4.0 v7.0.0-beta1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Packaging test fails on fedora 27, centos 7 in verify that the documents are there after restart
7 participants
@rjernst @elasticmachine @jpountz @alpar-t @colings86 @hub-cap @mark-vieira