fix(boot): 'jx upgrade boot' needs to fetch upgrade boot config SHA before cherrypicking #5977
+107
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/hold Holding until @macox is back. |
2 tasks
abayer
force-pushed
the
upgrade-boot-needs-to-fetch-upgrade-tag-or-sha
branch
from
e9a2e1f
to
d090452
Compare
|
/hold Removed the sleep now that #5981 has merged, taking off hold. |
…efore cherrypicking Without doing that, the cherry-pick will fail due to the commit from the release tag not being present in the local boot repo, since it's not on master. fixes jenkins-x#5974 Signed-off-by: Andrew Bayer <[email protected]>
abayer
force-pushed
the
upgrade-boot-needs-to-fetch-upgrade-tag-or-sha
branch
from
d090452
to
c8d3796
Compare
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: pmuir The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/hold cancel |
abayer
added a commit
to abayer/jx
that referenced
this pull request
Oct 30, 2019
This is needed due to jenkins-x#5977 causing `jx boot` to fail out if you clone a newer version of `jenkins-x-boot-config` than is in the version stream and then run `jx boot` from in that newer clone. Signed-off-by: Andrew Bayer <[email protected]>
abayer
added a commit
to abayer/jx
that referenced
this pull request
Oct 30, 2019
This is needed due to jenkins-x#5977 causing `jx boot` to fail out if you clone a newer version of `jenkins-x-boot-config` than is in the version stream and then run `jx boot` from in that newer clone. Signed-off-by: Andrew Bayer <[email protected]>
2 tasks
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Submitter checklist
Description
Without doing that, the cherry-pick will fail due to the commit from the release tag not being present in the local boot repo, since it's not on master.
Special notes for the reviewer(s)
/assign @pmuir
/assign @macox
Which issue this PR fixes
fixes #5974