Pipeline - merge and push

[Sharan Basappa]

I have created a pipeline script. The pipeline script runs in a 'topic' branch (e.g. my_feature).

Once test stage is successful, I would like to merge this into the master branch and then push the changes to remote.

However, I have some doubts. My test stage creates many intermediate files that would not be checked-in but are necessary for debug and analysis.

So, in order to merge, I need to first checkout the master branch. Doing this creates issue as I have untracked files.

But if I do git clean, I lose important log files that I might need for the next few days.

How can I handle this? Would git stash help in this case?

Thanks,

[Indra Gunawan (ingunawa)]

I would recommend that you include these files in a .gitignore so they are ignored by git.

 

-Indra

--
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 jenkinsci-use...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-users/e5b657d1-44c8-4445-b1e5-377e596ba94d%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[Sharan Basappa]

The issues is, the files generated during testing cannot be predicted and can keep changing. Also, even if I put them in Git ignore, how would checkout still work as the files are still local to my repo branch? 

On 9 Feb 2017 11:17 a.m., "Indra Gunawan (ingunawa)" <ingu...@cisco.com> wrote:

I would recommend that you include these files in a .gitignore so they are ignored by git.

 

-Indra

 

From: <jenkinsci-users@googlegroups.com> on behalf of Sharan Basappa <sharan....@gmail.com>
Reply-To: "jenkinsci-users@googlegroups.com" <jenkinsci-users@googlegroups.com>
Date: Wednesday, February 8, 2017 at 6:27 PM
To: Jenkins Users <jenkinsci-users@googlegroups.com>
Subject: Pipeline - merge and push

 

 

I have created a pipeline script. The pipeline script runs in a 'topic' branch (e.g. my_feature).

Once test stage is successful, I would like to merge this into the master branch and then push the changes to remote.

 

However, I have some doubts. My test stage creates many intermediate files that would not be checked-in but are necessary for debug and analysis.

So, in order to merge, I need to first checkout the master branch. Doing this creates issue as I have untracked files.

But if I do git clean, I lose important log files that I might need for the next few days.

How can I handle this? Would git stash help in this case?

 

Thanks,

--
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 jenkinsci-users+unsubscribe@googlegroups.com.

To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-users/e5b657d1-44c8-4445-b1e5-377e596ba94d%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to a topic in the Google Groups "Jenkins Users" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/jenkinsci-users/NVBBXLVevnM/unsubscribe.
To unsubscribe from this group and all its topics, send an email to jenkinsci-users+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-users/63429949-127D-424B-9EBE-88B6A2C9E5F3%40cisco.com.

[Sekhar Kari]

See if this helps

http://blogs.atlassian.com/2013/05/git-automatic-merges-with-server-side-hooks-for-the-win/

u may not be doing server side hooks, but u can write the similar script and invoke from pipeline.

On Thursday, February 9, 2017 at 11:31:48 AM UTC+5:30, Sharan Basappa wrote:

The issues is, the files generated during testing cannot be predicted and can keep changing. Also, even if I put them in Git ignore, how would checkout still work as the files are still local to my repo branch? 

On 9 Feb 2017 11:17 a.m., "Indra Gunawan (ingunawa)" <ingu...@cisco.com> wrote:

I would recommend that you include these files in a .gitignore so they are ignored by git.

 

-Indra

 

From: <jenkins...@googlegroups.com> on behalf of Sharan Basappa <sharan....@gmail.com>
Reply-To: "jenkins...@googlegroups.com" <jenkins...@googlegroups.com>
Date: Wednesday, February 8, 2017 at 6:27 PM
To: Jenkins Users <jenkins...@googlegroups.com>
Subject: Pipeline - merge and push

 

 

I have created a pipeline script. The pipeline script runs in a 'topic' branch (e.g. my_feature).

Once test stage is successful, I would like to merge this into the master branch and then push the changes to remote.

 

However, I have some doubts. My test stage creates many intermediate files that would not be checked-in but are necessary for debug and analysis.

So, in order to merge, I need to first checkout the master branch. Doing this creates issue as I have untracked files.

But if I do git clean, I lose important log files that I might need for the next few days.

How can I handle this? Would git stash help in this case?

 

Thanks,

--
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 jenkinsci-use...@googlegroups.com.

To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-users/e5b657d1-44c8-4445-b1e5-377e596ba94d%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to a topic in the Google Groups "Jenkins Users" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/jenkinsci-users/NVBBXLVevnM/unsubscribe.

To unsubscribe from this group and all its topics, send an email to jenkinsci-use...@googlegroups.com.