A
A
AstonMartin2017-08-13 05:57:42
git
AstonMartin, 2017-08-13 05:57:42

How to steer from Jira what will be included in the release?

Good afternoon!
Small team. We develop php applications for internal needs. Repository in bitbucket in the cloud. We also manage tasks in Jira in kanban. Smart commits are used to link issues and commits.
There is only one master branch in bitbucket.
There is a test server, everything is automatically deployed there after each push to the repository. There is a prod server where the code is laid out by manual git clone, also from the master branch after some testing. In general, everything is primitive and quite effective for our micro team).
I know about git flow, but I think that a full-fledged flow is not needed for us now.
There was such a problem: for example, we implemented 10 features, we are testing, 2 of them require quite a long revision. But I don’t want to wait, but I want ready-made 8 to fill in for production. Accordingly, a dev branch is most likely needed, and already tested features should get into the master from it.
Actually the question is: how to implement the process of merging tested features from dev to master as simply as possible? Ideally, this should be done directly from Jira ;) For example, I dragged the issue from the Review status to Done and Jira itself did merge dev -> master for all the commits included in the issue. Is there a plugin in jira for this?

Answer the question

In order to leave comments, you need to log in

1 answer(s)
I
index0h, 2017-08-13
@index0h

I know about git flow, but I think that a full-fledged flow is not needed for us now.

you contradict yourself
Will jira also rule conflicts?))
In my opinion, you are trying to automate what you do not need. It certainly looks good, but then again, what's the point? Well save you 5 minutes, so what?
But at the expense of flow with branches, I would figure it out earlier if I were you.
1. On the test server, we reset to origin/develop
2. Roll up the branch with the feature
3. Test
4. Clean up the test server and reset to origin/develop again
5. If everything is ok - TL merged the feature in develop
Steps 1, 2, 4 , 5 in total take 5 minutes.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question