Skip to content

Don't register destructiveDistroTest.docker twice#6930

Merged
owaiskazi19 merged 1 commit intoopensearch-project:mainfrom
dbwiddis:docker-repeat
Apr 3, 2023
Merged

Don't register destructiveDistroTest.docker twice#6930
owaiskazi19 merged 1 commit intoopensearch-project:mainfrom
dbwiddis:docker-repeat

Conversation

@dbwiddis
Copy link
Copy Markdown
Member

@dbwiddis dbwiddis commented Apr 2, 2023

Description

The destructiveDistroTest.docker task was already registered here:

lifecyleTasks.put(OpenSearchDistribution.Type.DOCKER, project.getTasks().register(taskPrefix + ".docker"));

Which is called here:

Map<OpenSearchDistribution.Type, TaskProvider<?>> lifecycleTasks = lifecycleTasks(project, "destructiveDistroTest");

Which causes duplicate registration here:

TaskProvider<Test> destructiveTask = configureTestTask(project, taskname, distribution, t -> {

This fixes the TODO by adding a test whether a task is already registered in place of the exception catch/warning.

Issues Resolved

Fixes #1640 (you're welcome).

Check List

  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Daniel Widdis <widdis@gmail.com>
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 2, 2023

Gradle Check (Jenkins) Run Completed with:

@dbwiddis
Copy link
Copy Markdown
Member Author

dbwiddis commented Apr 2, 2023

Gradle check failure: #6625 with pending PR fix #6748

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 2, 2023

Gradle Check (Jenkins) Run Completed with:

@codecov-commenter
Copy link
Copy Markdown

Codecov Report

Merging #6930 (bcb73ee) into main (c85d33e) will increase coverage by 0.06%.
The diff coverage is 0.00%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##               main    #6930      +/-   ##
============================================
+ Coverage     70.66%   70.72%   +0.06%     
- Complexity    59231    59282      +51     
============================================
  Files          4812     4812              
  Lines        283761   283759       -2     
  Branches      40917    40918       +1     
============================================
+ Hits         200519   200695     +176     
+ Misses        66784    66618     -166     
+ Partials      16458    16446      -12     
Impacted Files Coverage Δ
...a/org/opensearch/gradle/test/DistroTestPlugin.java 0.00% <0.00%> (ø)

... and 492 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@owaiskazi19 owaiskazi19 added the backport 2.x Backport to 2.x branch label Apr 3, 2023
@owaiskazi19 owaiskazi19 merged commit bcbb561 into opensearch-project:main Apr 3, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 3, 2023
Signed-off-by: Daniel Widdis <widdis@gmail.com>
(cherry picked from commit bcbb561)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@dbwiddis dbwiddis deleted the docker-repeat branch April 3, 2023 16:34
mitrofmep pushed a commit to mitrofmep/OpenSearch that referenced this pull request Apr 5, 2023
…#6930)

Signed-off-by: Daniel Widdis <widdis@gmail.com>
Signed-off-by: Valentin Mitrofanov <mitrofmep@gmail.com>
saratvemulapalli pushed a commit that referenced this pull request Apr 6, 2023
(cherry picked from commit bcbb561)

Signed-off-by: Daniel Widdis <widdis@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.x Backport to 2.x branch skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] Gradle configure registers destructiveDistroTest.docker task twice

4 participants