Matching Git Stream and QA

Question

Our project uses gitflow as detailed here. My question is how QA fits into this.

I have one master branch and one hotifx branch. Once the fix is ​​complete, I believe that QA should do its stuff in the fix release. If it failed, the hotfix is ​​updated with this hotfix. QA receives release again. Now that the RC patch passes QA, then the code is merged back into master (there should be no conflicts and just a direct copy, since the master does not change). Then the production release is performed from the wizard. The problem is that this QA havent checked this assembly. They checked the patch build.

How to reconcile master only for production code, but have QA testing on a sufficiently large production code? Has anyone got any experience in this scenario? I don't see anything detailed how QA and testing fit into gitflow.

thanks

Answer 1

Where does the QA fit? Everywhere.

I get your problem: if you want the wizard to be always ready for release, you want to make sure that your work is tested before you merge for mastering. But if you do not test against the master, what if a combination of your changes and someone else causes a problem? And if both of you do, isn't there a lot of work?

IMO , . , ( ) ( ) , , .

, . , , -, , , , ( , , ), , . , - . ( , ). , , master, .

, , , - , , . , , , .

: , , . , , " , " , - , , , , ? , , , , , .

Answer 2

, QA Gitflow. :

"", . , (), , , , , ( ) .

QA , ( gitflow).

, , 3- . , ( "", gitflow, , ). (, ) . , , QA .

(). , , , , . QA, .

QA , ( prod).

, , 2 ( ) - . . , , QA, , , . , , , master , ( maven nuget ) .

, , , QA, ( giflow release [ ]). .

Answer 3

Vincent Driessen git , , TEST, QA PRD.

, MASTER , , MASTER QA. PRD - , QA PRD.

QA, , , , . - , , .

With this in mind, your case can be resolved with

1) reset the leading branch to the production version

2) create a patch branch from the master

3) apply the patch to the patch branch

4) complete the patch branch and merge into master and development

Now you can create a candidate for release from the leading branch, which can be deployed to QA for testing, and then promote it in PRD when it is in order.