Skip to content
Snippets Groups Projects
Commit 697ea5ea authored by Julien Michel's avatar Julien Michel
Browse files

Merge branch 'testing-in-contribution-guidelines' into 'develop'

Update CONTRIBUTING.md to explain how to register branches for dashboard testing.

See merge request orfeotoolbox/otb!10
parents 660ffd51 de0c344e
No related branches found
No related tags found
No related merge requests found
......@@ -89,10 +89,33 @@ Request against the `develop` branch on GitLab using the merge request
template. The merge request will then be discussed by the community and the core
OTB team.
* Merge requests can not be merged until all discussions have been resolved (this is enforced by GitLab).
* Merge requests **must receive at least 2 positives votes from PSC members** before being merged.
* The merger is responsible for checking that the branch is up-to-date with develop and that the dashboard is ok.
* Merge requests can not be merged until all discussions have been resolved (this is enforced by GitLab)
* Merge requests **must receive at least 2 positives votes from PSC members** before being merged
* The merger is responsible for checking that the branch is up-to-date with develop
* Merge requests can be merged by anyone (not just PSC or RM) with push access to develop
* Merge requests can be merged once the dashboard is proven green for this branch
Branches can be registered for dashboard testing by adding one line in `Config/feature_branches.txt` in [otb-devutils repository](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-devutils.git).
For branches in the main repository, the syntax is the following:
```
branch_name [otb-data_branch_name]
```
The second branch name is optional. It can be set if you need to modify [otb-data](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-data.git) according to your changes.
For branches in forks, the syntax is the following:
```
user/branch_name [user/otb-data_branch_name]
```
Again, the second branch name is optional.
For users without push access to [otb-devutils repository](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-devutils.git), the modification can be asked through a merge requests to this repository.
Once the feature branch is registered for testing, it should appear in the *FeatureBranches* section of the [OTB dashboard](https://dash.orfeo-toolbox.org/index.php?project=OTB) next day (remember tests are run on a nighlty basis).
Do not forget to remove the feature branch for testing once it has been merged.
## Remote modules
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment