sorry, forgot to paste my script in it's current state:
node {
stage "Setup"
git branch: DEVELOPMENT_BRANCH,
url: GIT_REPO
stage 'Refresh Shared Branch'
echo "Refresh ${DEVELOPMENT_BRANCH} from ${UPSTREAM_BRANCH}"
def ret = bat "git merge ${UPSTREAM_BRANCH}"
echo ret
if( ret )
{
input message: 'Merge Conflict detected', ok: 'Merge Resolved'
}
stage 'Build'
echo "Incrementally building ${DEVELOPMENT_BRANCH} in ${GIT_WORKSPACE}"
stage 'unittest'
echo "unittesting"
}
On Wednesday, May 4, 2016 at 12:15:23 PM UTC-4, Brent Kilgore wrote:
>
> I am trying to set up a pipeline job that imitates what we have now in
> jenkins as a huge complicated mess of batch script steps. I am having
> issues getting my foot in the door so to speak. I am running newest 2.0
> build in windows
>
> The first issue is i cant seem to find any good references for the
> pipeline groovy interface anywhere. Specifically, the ONLY information
> I've seen for the git/scm/etc method are random snippets of code floating
> about. the pipeline documentation on the jenkins site seems to just
> regurgitate the same hello world and/or some VERY specific scenarios that
> do not apply at all. I need a comprehensive API documentation (parameters,
> return types, etc.)
>
> Here is the workflow what I'm trying to implement.
>
> 1. git fetch
> 2. <git checkout localbranch... since im reusing a folder dedicated
> for this, this should no-op>
> 3. git merge upstream-branch
> 4. if merge conflicts, pause for manual resolution. <--- this is the
> "killer feature" i was wanting from pipelines
> 5. git push origin localbranch
> 6. <perform incremental build by executing perl script>
> 7. <perform unit tests>
> 8. <email results>
>
> The rest of my issues can probably be resolved with some documentation,
> but ill list them here anyway:
>
> - I cannot get the git step to use credentials (ssh specifically). My
> git server DOES have a self-signed certificate, but i have verification
> turned off globally. If i omit the credentials and jenkins server as my
> windows user (which is setup to use ssh) the checkout/clone succeeds.
> - I cant figure out how to make the git step do anything but checkout.
> For step 4, I have had to resort to using bat steps to perform other git
> tasks.
> - I cant figure out how to prevent the job from failing if the bat
> step fails.
> - once resolved: how do i retrieve the return code from the bat
> step?
> - I assume executing a perl script is also done with a bat step?
>
>
>
>
>
--
You received this message because you are subscribed to the Google Groups
"Jenkins Users" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/jenkinsci-users/2cf19f60-390e-4433-8e81-542be32d70d6%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
