Delete app fails with cherry-pick error #6350

tdcox · 2019-12-16T17:06:27Z

Summary

Attempting to delete an App using jx delete app fails under some circumstances due to a cherry pick error.

Steps to reproduce the behavior

➜ jx delete app jx-app-fossa
Attempting to cherry pick commits that were on master but not yet pushed
error: couldn't pull the environment repository from dev: Unable to cherry-pick a155412b72bd8ca8123a8e3b0993a5bd49ca577d: git output: error: commit a155412b72bd8ca8123a8e3b0993a5bd49ca577d is a merge but no -m option was given.
fatal: cherry-pick failed: failed to run 'git cherry-pick a155412b72bd8ca8123a8e3b0993a5bd49ca577d' command in directory '/Users/terry/.jx/environments', output: 'error: commit a155412b72bd8ca8123a8e3b0993a5bd49ca577d is a merge but no -m option was given.
fatal: cherry-pick failed'

Jx version

The output of jx version is:

jx                 2.0.1011
Kubernetes cluster v1.13.11-gke.14
kubectl            v1.16.2
helm client        Client: v2.14.0+g05811b8
git                2.21.0
Operating System   Mac OS X 10.14.6 build 18G1012

Jenkins type

Serverless Jenkins X Pipelines (Tekton + Prow)
Classic Jenkins

The text was updated successfully, but these errors were encountered:

seanpianka · 2019-12-17T21:01:17Z

Under ~/.jx/environments, there seems to be local changes made to this repository, and the cherry-pick for merging these commits with remote is failing.

Specifically, there's this part of the error message:

failed to run 'git cherry-pick a155412b72bd8ca8123a8e3b0993a5bd49ca577d' command in directory '/Users/terry/.jx/environments', output: 'error: commit a155412b72bd8ca8123a8e3b0993a5bd49ca577d is a merge but no -m option was given.

I'm running into this issue due to untracked directories within ~/.jx/environments.

See these lines under pkg/gits/helpers.go.

hferentschik · 2019-12-19T12:16:23Z

Caused by the same issue as #5772

tdcox · 2020-01-09T15:39:26Z

Looking at the commits referenced in a recent repeat of this problem, it appears that the system is trying to refresh ~/.jx/environments with a commit that is already in ~/.jx/environments/dev and git is refusing to create the ensuing Inception nesting.

abayer · 2020-01-09T16:45:13Z

Ok, just verified that if you have a fresh boot cluster with gitops enabled and run jx add app ..., it will create ~/.jx/environments (that may already exist, not 100% sure, but if it does, it's empty at this point) and then clone the dev env into ~/.jx/environments/dev. But then if you run jx delete app ... afterwards, it ends up cloning the dev env again into ~/.jx/environments directly - well, technically it runs git init .; git fetch ...; git checkout ... in ~/.jx/environments. Not sure yet if that's specific to running jx delete app ... or would happen for jx add app ... after the first call, and not sure yet why it's happening.

abayer · 2020-01-09T16:56:17Z

Verified that it is specifically running jx delete app ..., and that it's not an ordering thing. jx delete app ... just does...weird things. Working on it.

Also adds `--auto-merge` to `jx delete app` fixes jenkins-x#6350 Signed-off-by: Andrew Bayer <[email protected]>

abayer · 2020-01-09T17:10:33Z

Ah-ha, it's actually the logic behind jx get apps to blame - it's always using ~/.jx/environments and initing/fetching to that directory, and that logic gets called as part of jx delete app.

abayer · 2020-01-09T17:13:55Z

Actually, why the heck is jx get apps doing a ForkAndPullRepo in the first place?!?

…te in JX_HOME Until this, `jx delete app`, `jx add app`, and `jx get apps` all did weird things with/under `~/.jx/environments`. All of them used `ForkAndPullRepo` to clone under there - `jx get apps` directly into `~/.jx/environments`, and `jx add app` and `jx delete app` into `~/.jx/environments/dev`. Literally none of this made sense. =) This changes `jx add app` and `jx delete app` to perform more standard PR creation via `ForkAndPullRepo`, using a temporary directory for the clone, and changes `jx get apps` to just clone (currently deleting/recloning each time it's called to make sure nothing has gone weird with the remotes) into `~/.jx/environments/dev`. Also adds `--auto-merge` to `jx delete app` fixes jenkins-x#6350 Signed-off-by: Andrew Bayer <[email protected]>

abayer · 2020-01-09T17:53:27Z

Sooooo yeah. jx add app and jx delete app use ~/.jx/environments/dev with ForkAndPullRepo, which makes no sense. And jx get apps is using ForkAndPullRepo to clone to ~/.jx/environments but not to create a PR or anything. This is goofy. Reworking.

…te in JX_HOME Until this, `jx delete app`, `jx add app`, and `jx get apps` all did weird things with/under `~/.jx/environments`. All of them used `ForkAndPullRepo` to clone under there - `jx get apps` directly into `~/.jx/environments`, and `jx add app` and `jx delete app` into `~/.jx/environments/dev`. Literally none of this made sense. =) This changes `jx add app` and `jx delete app` to perform more standard PR creation via `ForkAndPullRepo`, using a temporary directory for the clone, and changes `jx get apps` to just clone to a temporary directory. This all just applies when gitops is enabled. Also adds `--auto-merge` to `jx delete app` fixes jenkins-x#6350 Signed-off-by: Andrew Bayer <[email protected]>

Until this, `jx delete app`, `jx add app`, and `jx get apps` all did weird things with/under `~/.jx/environments`. All of them used `ForkAndPullRepo` to clone under there - `jx get apps` directly into `~/.jx/environments`, and `jx add app` and `jx delete app` into `~/.jx/environments/dev`. Literally none of this made sense. =) This reworks not just the app commands, but all commands that create PRs (i.e., gitops) against the dev/prod/staging environments to use temporary directories for the fork/clone/push, with the option, just used in tests, of specifying an existing directory to use instead, while `jx get apps` just clones to a temporary directory as well. Switching all this to temporary directories also really helps users who manage/work with multiple JX clusters from a single laptop/desktop/host, since namespacing `~/.jx/environments` by cluster is basically impossible so far as I can tell. Also adds `--auto-merge` to `jx delete app` because I was here. fixes jenkins-x#6350 Signed-off-by: Andrew Bayer <[email protected]>

Until this, `jx delete app`, `jx add app`, and `jx get apps` all did weird things with/under `~/.jx/environments`. All of them used `ForkAndPullRepo` to clone under there - `jx get apps` directly into `~/.jx/environments`, and `jx add app` and `jx delete app` into `~/.jx/environments/dev`. Literally none of this made sense. =) This reworks not just the app commands, but all commands that create PRs (i.e., gitops) against the dev/prod/staging environments to use temporary directories for the fork/clone/push, with the option, just used in tests, of specifying an existing directory to use instead, while `jx get apps` just clones to a temporary directory as well. Switching all this to temporary directories also really helps users who manage/work with multiple JX clusters from a single laptop/desktop/host, since namespacing `~/.jx/environments` by cluster is basically impossible so far as I can tell. Also adds `--auto-merge` to `jx delete app` because I was here. fixes #6350 Signed-off-by: Andrew Bayer <[email protected]>

Until this, `jx delete app`, `jx add app`, and `jx get apps` all did weird things with/under `~/.jx/environments`. All of them used `ForkAndPullRepo` to clone under there - `jx get apps` directly into `~/.jx/environments`, and `jx add app` and `jx delete app` into `~/.jx/environments/dev`. Literally none of this made sense. =) This reworks not just the app commands, but all commands that create PRs (i.e., gitops) against the dev/prod/staging environments to use temporary directories for the fork/clone/push, with the option, just used in tests, of specifying an existing directory to use instead, while `jx get apps` just clones to a temporary directory as well. Switching all this to temporary directories also really helps users who manage/work with multiple JX clusters from a single laptop/desktop/host, since namespacing `~/.jx/environments` by cluster is basically impossible so far as I can tell. Also adds `--auto-merge` to `jx delete app` because I was here. fixes jenkins-x#6350 Signed-off-by: Andrew Bayer <[email protected]>

deanesmith added kind/bug Issue is a bug area/apps priority/important-longterm labels Dec 17, 2019

hferentschik mentioned this issue Dec 19, 2019

Unable to re-run 'jx boot' from the initial boot config directory #5772

Closed

abayer added a commit to abayer/jx that referenced this issue Jan 9, 2020

fix: GetApps should clone to environments/dev, not environments

a7ae93a

Also adds `--auto-merge` to `jx delete app` fixes jenkins-x#6350 Signed-off-by: Andrew Bayer <[email protected]>

abayer added a commit to abayer/jx that referenced this issue Jan 9, 2020

fix: GetApps should clone to environments/dev, not environments

07a09f2

Also adds `--auto-merge` to `jx delete app` fixes jenkins-x#6350 Signed-off-by: Andrew Bayer <[email protected]>

abayer added estimate/M ready for review labels Jan 9, 2020

abayer self-assigned this Jan 9, 2020

abayer added this to the Sprint 0 2020 milestone Jan 9, 2020

abayer mentioned this issue Jan 9, 2020

fix: Cloning for environments shouldn't leave strange state in JX_HOME #6479

Merged

2 tasks

jenkins-x-bot closed this as completed in #6479 Jan 13, 2020

deanesmith removed the ready for review label Jan 13, 2020

abayer mentioned this issue Feb 17, 2020

jx add app jx-app-sso fails with git errors #5713

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Delete app fails with cherry-pick error #6350

Delete app fails with cherry-pick error #6350

tdcox commented Dec 16, 2019

seanpianka commented Dec 17, 2019 •

edited

Loading

hferentschik commented Dec 19, 2019

tdcox commented Jan 9, 2020

abayer commented Jan 9, 2020

abayer commented Jan 9, 2020

abayer commented Jan 9, 2020

abayer commented Jan 9, 2020

abayer commented Jan 9, 2020

Delete app fails with cherry-pick error #6350

Delete app fails with cherry-pick error #6350

Comments

tdcox commented Dec 16, 2019

Summary

Steps to reproduce the behavior

Jx version

Jenkins type

seanpianka commented Dec 17, 2019 • edited Loading

hferentschik commented Dec 19, 2019

tdcox commented Jan 9, 2020

abayer commented Jan 9, 2020

abayer commented Jan 9, 2020

abayer commented Jan 9, 2020

abayer commented Jan 9, 2020

abayer commented Jan 9, 2020

seanpianka commented Dec 17, 2019 •

edited

Loading