Do a hard reset if tck update fails and try git pull again #3978
Conversation
Mesbah-Alam
changed the title
Mesbah-Alam
force-pushed
the
fix-jck-update-git-logic
branch
8 times, most recently
from
e0f6496
to
c25de62
Compare
Signed-off-by: Mesbah Alam <Mesbah_Alam@ca.ibm.com>
Mesbah-Alam
force-pushed
the
fix-jck-update-git-logic
branch
from
c25de62
to
3f04c94
Compare
|
Step 1: Error reproduced on Grinder_JCK/668: Additional test where local repo is already up-to-date: Grinder_JCK/675. |
Mesbah-Alam
changed the title
|
Verified in TC Grinder/1815 |
| <exec executable="git" dir="${JCK_ROOT_USED}" failonerror="true"> | ||
| <arg value="reset" /> | ||
| <arg value="--hard" /> | ||
| <arg value="origin/master" /> |
There was a problem hiding this comment.
Why we need to reset to origin/master, then clean and pull again? Could we just hard reset to ${JCK_GIT_REPO_USED} ${jck_branch} directly?
There was a problem hiding this comment.
I had tried reset --hard ${JCK_GIT_REPO_USED} ${jck_branch} but that didn't seem to work in our case. The change in the PR had worked. I am not sure about the difference. I think we can merge this and see if the problem ever comes back again - if it does we can try other ways.
There was a problem hiding this comment.
Any idea what error we get when we do reset --hard ${JCK_GIT_REPO_USED} ${jck_branch}?
There was a problem hiding this comment.
I have seen the merge conflict remain after reset --hard ${JCK_GIT_REPO_USED} ${jck_branch}.
There was a problem hiding this comment.
Btw, here origin = {JCK_GIT_REPO_USED}; e.g. Grinder_JCK/672/console. The git clean is just added as an extra step to clean up any possible garbage left behind after the reset.
There was a problem hiding this comment.
Did you try just git reset --hard?
I don't really like hardcoding origin/master since those names are not guaranteed. Especially since master is being renamed to main.
There was a problem hiding this comment.
Did you try just git reset --hard? - yes, and that did not get rid of the merge conflict.
"Especially since master is being renamed to main." - do you mean in our internal JCK repos?
There was a problem hiding this comment.
Talked with @Mesbah-Alam , we think it is the best solution so far. We will merge it and monitor the result.
If there are changes in local tck repo on disc in a Jenkins machine, the default git pull results in a merge conflict and the build fails.
If this merge conflict occurs, this PR will catch it and clean up any local changes by performing a
git --reset hardand agit clean, andgit pullagain.Related backlog issue: backlog/issues/705
Signed-off-by: Mesbah Alam Mesbah_Alam@ca.ibm.com