jx upgrade boot fails when nexus is disabled

[rudolph9]

Summary

Conflict when cherry-picking commit during jx upgrade boot
I may just be missing something obvious.

Steps to reproduce the behavior

1. Configure a cluster with jx-boot based on eda57588042df006ca2cf65bf736f9e3fcb7278e release 1.0.38 https://github.com/exergy/environment-alpha25-dev
2. disable the nexus server

---
 env/nexus/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/env/nexus/values.yaml b/env/nexus/values.yaml
index d4ca941..bc11441 100644
--- a/env/nexus/values.yaml
+++ b/env/nexus/values.yaml
@@ -1 +1 @@
-enabled: true
+enabled: false
-- 

3. run jx upgrade boot

Expected behavior

It to work or give me an option to resolve conflict

Actual behavior

orgname/environment-cluster-dev [branch-for-upgrading-based-on-master] $ jx upgrade boot
? A local Jenkins X versions repository already exists, pulling the latest: Yes
Upgrade available
using default boot config https://github.com/jenkins-x/jenkins-x-boot-config.git
? A local Jenkins X versions repository already exists, pulling the latest: Yes
? A local Jenkins X versions repository already exists, pulling the latest: Yes
boot config upgrade available
Upgrading from v1.0.38 to v1.0.47
cherry picking commits in the range eda57588042df006ca2cf65bf736f9e3fcb7278e..299ec2978c1d7e8c0698de0be1be96c520d6ddf0
6b99c30b1d6ded3336646be32f6d3059cd74e5ef - fix: added velero configuration for iks
error: failed to update boot configuration: failed to cherry pick upgrade commits: cherry-picking a8c773903c0a96e036eb7bfab8ff97a8b3acb358: git output: error: could not apply a8c7739... fix: allow bucketrepo to be used as a repository
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit': failed to run 'git cherry-pick a8c773903c0a96e036eb7bfab8ff97a8b3acb358 --strategy=recursive -X theirs' command in directory '/tmp/284747986', output: 'error: could not apply a8c7739... fix: allow bucketrepo to be used as a repository
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit''

Jx version

The output of jx version is:

jx version
NAME               VERSION
jx                 2.0.976
Kubernetes cluster v1.13.11-gke.9
kubectl            v1.16.2
helm client        Client: v2.13.1+g618447c
git                2.17.1
Operating System   Ubuntu 18.04.3 LT

Jenkins type

• Serverless Jenkins X Pipelines (Tekton + Prow)
• Classic Jenkins

Kubernetes cluster

jx create cluster gke --skip-installation -n clustername --region=us-west1 --max-num-nodes=9 --min-num-nodes=1

Operating system / Environment

$  jx version
.
.
.
Operating System   Ubuntu 18.04.3 LTS

[rudolph9]

Any conflicts result in the same issue.

[jenkins-x-bot]

Issues go stale after 90d of inactivity.
Mark the issue as fresh with /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
If this issue is safe to close now please do so with /close.
Provide feedback via https://jenkins-x.io/community.
/lifecycle stale

[jenkins-x-bot]

Stale issues rot after 30d of inactivity.
Mark the issue as fresh with /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.
If this issue is safe to close now please do so with /close.
Provide feedback via https://jenkins-x.io/community.
/lifecycle rotten

[jenkins-x-bot]

Issues go stale after 90d of inactivity.
Mark the issue as fresh with /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
If this issue is safe to close now please do so with /close.
Provide feedback via https://jenkins-x.io/community.
/lifecycle stale

[jenkins-x-bot]

Stale issues rot after 30d of inactivity.
Mark the issue as fresh with /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.
If this issue is safe to close now please do so with /close.
Provide feedback via https://jenkins-x.io/community.
/lifecycle rotten

[jenkins-x-bot]

Rotten issues close after 30d of inactivity.
Reopen the issue with /reopen.
Mark the issue as fresh with /remove-lifecycle rotten.
Provide feedback via https://jenkins-x.io/community.
/close

[jenkins-x-bot]

@jenkins-x-bot: Closing this issue.

In response to this:

Rotten issues close after 30d of inactivity.
Reopen the issue with /reopen.
Mark the issue as fresh with /remove-lifecycle rotten.
Provide feedback via https://jenkins-x.io/community.
/close

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the jenkins-x/lighthouse repository.