Skip to content

Revert fixes related to JENKINS-67351 and JENKINS-67164 #197

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

Merged
merged 2 commits into from
Jan 16, 2022

Conversation

dwnusbaum
Copy link
Member

Reverts #188 and #185 due to problems in jenkinsci/workflow-api-plugin#188 (see jenkinsci/workflow-api-plugin#188 (comment)) which have no obvious fix and so require the workflow-api PRs to be reverted. jenkinsci/workflow-api-plugin#188 introduced an API required here after #188, but that API will be removed once the workflow-api PRs are reverted, so we need to revert the PRs here as well.

These fixes were generally expected only to apply to uncommon scenarios related to disaster recovery (although they apparently also mattered for regular usage of ci.jenkins.io as mentioned in #185 (comment)), so I think it is ok to revert them for now.

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests - that demonstrates feature works or fixes the issue

…getCauseOfBlockage in normal scenarios (jenkinsci#188)"

This reverts commit 5dab75a.
…ut the associated build is complete (jenkinsci#185)"

This reverts commit 9c8d2f4.
@dwnusbaum dwnusbaum requested review from jglick and car-roll January 14, 2022 22:15
@jglick
Copy link
Member

jglick commented Jan 14, 2022

that API will be removed once the workflow-api PRs are reverted

Just deprecate for now?

@@ -424,23 +423,6 @@ public String getCookie() {
}

@Override public CauseOfBlockage getCauseOfBlockage() {
if (FlowExecutionList.get().isResumptionComplete()) {
Copy link
Member Author

Choose a reason for hiding this comment

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

I think I will preserve this API in workflow-api temporarily after I revert PRs over there just in case users update workflow-api before workflow-durable-task-step, but I will just make it always return false.

Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

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

:sadpanda:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants