Checkout matching openshift-ansible branch #434
Conversation
| @@ -23,6 +23,10 @@ extensions: | |||
| script: |- | |||
| tito_tmp_dir="tito" | |||
| mkdir -p "${tito_tmp_dir}" | |||
| if [[ ${ORIGIN_TARGET_BRANCH} == release-1.* ]] | |||
| then | |||
| git checkout -b ${ORIGIN_TARGET_BRANCH} origin/${ORIGIN_TARGET_BRANCH} | |||
There was a problem hiding this comment.
Isn't there a bunch of logic for translating branch names? Where Origin has release-1.x or release-3.x and OpenShift Ansible has enterprise-x?
There was a problem hiding this comment.
I dont think so, cause when you check the origin repo branches you can see what branches are there, in this case only release-1.x and stage-1.x ... and those reflect to the o-a branches... enterprise-1.x branches are only present in OCP
There was a problem hiding this comment.
oh, maybe scott moved them
There was a problem hiding this comment.
Definitely used to be enterprise-x
There was a problem hiding this comment.
Yeah I was surprised as well, cause I remember they have been there
|
I would rather see if we can fix the |
|
Yeah I kinda understand why you want to fix it in the generated step but this is a pretty specific use-case in which we checkout the branch of o-a repository based on the branch against which the PR is sent. Not sure if this wouldn't be better in the step itself with a proper comment @stevekuznetsov thoughts ? |
|
Any reason why we don't always want to check out the matching branch if it exists? Seems like this would be applicable to |
|
Closing in favor of #434 |
@stevekuznetsov PTAL
Running tests with mentioned changes:
Fixes openshift/origin#15186