Skip to content
GitLab

Contribution workflow · Changes

Page history
Update Contribution workflow authored by Damien Dosimont's avatar Damien Dosimont
Show whitespace changes
Inline Side-by-side
Contribution-workflow.md
View page @ a5177972
...@@ -92,81 +92,160 @@ Last, run a testsuite on your test branch `mytests` to validate your changes. On ...@@ -92,81 +92,160 @@ Last, run a testsuite on your test branch `mytests` to validate your changes. On
Go to the test directory that is the most appropriate (for instance `fast/nastin` if your test is related to a nastin feature), and add a new directory and `.json` file the same way it is done for the existing tests. Go to the test directory that is the most appropriate (for instance `fast/nastin` if your test is related to a nastin feature), and add a new directory and `.json` file the same way it is done for the existing tests.
Add the files to the git repository, commit them and push them. Follow the same process as for modifying a test. Add the files to the git repository, commit them and push them. Follow the same process as for modifying a test.
## Testsuite configuration ## Test .json
If your test needs to be discarded for specific builds (for instance, your test depends on i4 and you want to discard it for i8), you will have to modify the related configuration file and add your test to the list of excluded tests in the testsuite repository https://gitlab.bsc.es/alya/alya-testsuite/. Since you cannot modify the master directly, you will need to create a new branch the same way you did it for the `alya-tests` git repository: Here, you will find an example of json file for tests:
Get the git testsuite repository ```json
{
```sh "authors": [
git clone git@gitlab-internal.bsc.es:alya/alya-testsuite.git "ambrus.both@bsc.es"
cd alya-testsuite ],
``` "comparisons": [
{
If you already have it, update it: "cols": [
```sh 2,
git pull 3,
``` 4,
5,
The `master` branch is protected, so you won't be allowed to modify it. Create a new branch with the name of your choice, let's say `mytestsuite`: 6
],
```sh "file": "non_prem_box_SqSq-boundary.chm.set",
git checkout -b mytestsuite "method": "absolute",
``` "tolerance": "1.0e-10"
},
or just switch to this branch if it already exists: {
"cols": [
```sh 1,
git checkout mytestsuite 2,
``` 3,
4,
Don't forget to update your already existing branch with the last version of the master: 9,
10,
``` 11,
git fetch 12,
git merge origin/master 13,
``` 24,
15,
Push your branch. 16
If it is your first push: ],
"file": "non_prem_box_SqSq.chm.wit",
```sh "method": "absolute",
git push -u origin mytestsuite "tolerance": "1.0e-6"
},
{
"cols": [
1,
2
],
"file": "non_prem_box_SqSq.tem.wit",
"method": "absolute",
"tolerance": "1.0e-10"
},
{
"file": "non_prem_box_SqSq-CON01-00000010.post.mpio.txt",
"method": "absolute",
"tolerance": "1.0e-7"
},
{
"file": "non_prem_box_SqSq-CON02-00000010.post.mpio.txt",
"method": "absolute",
"tolerance": "1.0e-7"
},
{
"file": "non_prem_box_SqSq-CON03-00000010.post.mpio.txt",
"method": "absolute",
"tolerance": "1.0e-7"
},
{
"file": "non_prem_box_SqSq-CON04-00000010.post.mpio.txt",
"method": "absolute",
"tolerance": "1.0e-7"
},
{
"file": "non_prem_box_SqSq-SCO01-00000010.post.mpio.txt",
"method": "absolute",
"tolerance": "1.0e-7"
},
{
"file": "non_prem_box_SqSq-SCO02-00000010.post.mpio.txt",
"method": "absolute",
"tolerance": "1.0e-7"
},
{
"file": "non_prem_box_SqSq-SCO03-00000010.post.mpio.txt",
"method": "absolute",
"tolerance": "1.0e-7"
},
{
"file": "non_prem_box_SqSq-SCO04-00000010.post.mpio.txt",
"method": "absolute",
"tolerance": "1.0e-7"
},
{
"file": "non_prem_box_SqSq-TEMPE-00000010.post.mpio.txt",
"method": "absolute",
"tolerance": "1.0e-2"
},
{
"file": "non_prem_box_SqSq-XYR-00000010.post.mpio.txt",
"method": "absolute",
"tolerance": "1.0e-7"
},
{
"file": "non_prem_box_SqSq-XYS-00000010.post.mpio.txt",
"method": "absolute",
"tolerance": "1.0e-7"
},
{
"file": "non_prem_box_SqSq-XZR-00000010.post.mpio.txt",
"method": "absolute",
"tolerance": "1.0e-6"
},
{
"file": "non_prem_box_SqSq-XZS-00000010.post.mpio.txt",
"method": "absolute",
"tolerance": "1.0e-6"
},
{
"file": "non_prem_box_SqSq-VELOC-00000010.post.mpio.txt",
"method": "absolute",
"tolerance": "1.0e-6"
}
],
"description": "Non premixed flame in square shaped duct with slip walls, both variance models on with transporting the square of control variables.",
"exclude": [
"special"
],
"executions": [
{
"commands": {
"pp": "[ALYA-PATH]/Utils/user/pgiFormat2Standard.sh non_prem_box_SqSq-boundary.chm.set non_prem_box_SqSq.tem.wit non_prem_box_SqSq.chm.wit; echo | [POST] non_prem_box_SqSq"
},
"mpi": 1,
"openmp": 0
},
{
"commands": {
"pp": "[ALYA-PATH]/Utils/user/pgiFormat2Standard.sh non_prem_box_SqSq-boundary.chm.set non_prem_box_SqSq.tem.wit non_prem_box_SqSq.chm.wit; echo | [POST] non_prem_box_SqSq"
},
"mpi": 3,
"openmp": 0
},
{
"commands": {
"pp": "[ALYA-PATH]/Utils/user/pgiFormat2Standard.sh non_prem_box_SqSq-boundary.chm.set non_prem_box_SqSq.tem.wit non_prem_box_SqSq.chm.wit; echo | [POST] non_prem_box_SqSq"
},
"mpi": 3,
"openmp": 3
}
],
"modules": [
"nastin",
"temper",
"chemic"
],
"name": "non_prem_box_SqSq",
"postprocess": "mpio2txt"
}
``` ```
\ No newline at end of file
else:
```sh
git push
```
modify the appropriate configuration files located in `serverConfig`.
Run a testsuite so you validate that your modifications do not break its behavior.
Then, add the modified configuration files to the list of tracked file:
```sh
git add configFile1 configFile2
```
Commit:
```sh
git commit
```
And push:
```sh
git push
```
If necessary, update your branch with the master:
```
git fetch
git merge origin/master
git push
```
Ask your admin to [merge](https://gitlab.bsc.es/alya/alya-testsuite/merge_requests) your branch.
\ No newline at end of file