Skip to content
This repository was archived by the owner on Nov 24, 2021. It is now read-only.

Commit 5af7dbe

Browse files
gorzellgorzell
committed
tests: Fix up all the test job JSON to reflect the new schema.
1 parent cbea5e2 commit 5af7dbe

File tree

6 files changed

+129
-102
lines changed

6 files changed

+129
-102
lines changed

‎packages/model-runner/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,4 @@ run-local: build
4242

4343
.PHONY: run-remote
4444
run-remote:
45-
./bin/submit-run ~/.github/covid_pat.json test/test-job-mrc-ide-covidsim.json
46-
./bin/submit-run ~/.github/covid_pat.json test/test-job-basel.json
47-
./bin/submit-run ~/.github/covid_pat.json test/test-job-mc19.json
45+
./bin/submit-run ~/.github/covid_pat.json test/test-job-matrix.json

‎packages/model-runner/test/test-job-matrix.json

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"id": "my-model-run-id",
3+
"callbackURL": null,
4+
"models": [
5+
{
6+
"slug": "mrc-ide-covid-sim",
7+
"imageURL": "docker.pkg.github.com/covid-modeling/model-runner/mrc-ide-covidsim-connector:master"
8+
},
9+
{
10+
"slug": "basel",
11+
"imageURL": "docker.pkg.github.com/covid-modeling/model-runner/neherlab-covid-19-scenarios-connector:master"
12+
},
13+
{
14+
"slug": "mc19",
15+
"imageURL": "docker.pkg.github.com/covid-modeling/model-runner/modelingcovid-covidmodel-connector:master"
16+
}
17+
],
18+
"configuration": {
19+
"region": "US",
20+
"subregion": "US-NY",
21+
"parameters": {
22+
"calibrationDate": "2020-04-18",
23+
"calibrationCaseCount": 1400,
24+
"calibrationDeathCount": 200,
25+
"interventionPeriods": [
26+
{
27+
"startDate": "2020-03-18",
28+
"reductionPopulationContact": 10,
29+
"socialDistancing": "moderate"
30+
},
31+
{
32+
"startDate": "2020-03-22",
33+
"reductionPopulationContact": 34,
34+
"socialDistancing": "moderate",
35+
"schoolClosure": "aggressive"
36+
},
37+
{
38+
"startDate": "2020-03-23",
39+
"reductionPopulationContact": 64,
40+
"socialDistancing": "aggressive",
41+
"schoolClosure": "aggressive"
42+
},
43+
{
44+
"startDate": "2020-07-01",
45+
"reductionPopulationContact": 0
46+
}
47+
],
48+
"r0": null
49+
}
50+
}
51+
}

‎packages/model-runner/test/test-job-mc19.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
"startDate": "2020-07-01",
3737
"reductionPopulationContact": 0
3838
}
39-
]
39+
],
40+
"r0": null
4041
}
4142
}
4243
}

‎packages/model-runner/test/test-job-mrc-ide-covidsim.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
"startDate": "2020-06-01",
4444
"reductionPopulationContact": 0
4545
}
46-
]
46+
],
47+
"r0": null
4748
}
4849
}
4950
}

‎packages/mrc-ide-covidsim/test/test-job.json

Lines changed: 37 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,40 @@
11
{
2-
"id": "my-model-run-id",
3-
"models": [
4-
{
5-
"slug": "mrc-ide-covid-sim",
6-
"imageURL": "docker.pkg.github.com/covid-modeling/model-runner/mrc-ide-covidsim-connector:image-runner"
7-
}
8-
],
9-
"callbackURL": null,
10-
"configuration": {
11-
"model": {
12-
"slug": "mrc-ide-covid-sim",
13-
"imageURL": "docker.pkg.github.com/covid-modeling/model-runner/mrc-ide-covidsim-connector:image-runner"
14-
},
15-
"region": "US",
16-
"subregion": "US-WY",
17-
"parameters": {
18-
"r0": 3.5,
19-
"calibrationDate": "2020-04-18",
20-
"calibrationCaseCount": 1400,
21-
"calibrationDeathCount": 200,
22-
"interventionPeriods": [
23-
{
24-
"startDate": "2020-03-15",
25-
"reductionPopulationContact": 15,
26-
"socialDistancing": "moderate"
27-
},
28-
{
29-
"startDate": "2020-03-21",
30-
"reductionPopulationContact": 65,
31-
"socialDistancing": "moderate",
32-
"schoolClosure": "aggressive"
33-
},
34-
{
35-
"startDate": "2020-03-25",
36-
"reductionPopulationContact": 90,
37-
"socialDistancing": "aggressive",
38-
"schoolClosure": "aggressive"
39-
},
40-
{
41-
"startDate": "2020-05-01",
42-
"reductionPopulationContact": 50,
43-
"socialDistancing": "moderate",
44-
"schoolClosure": "mild"
45-
},
46-
{
47-
"startDate": "2020-06-01",
48-
"reductionPopulationContact": 0
49-
}
50-
],
51-
"r0": null
52-
}
2+
"region": "US",
3+
"subregion": "US-WY",
4+
"parameters": {
5+
"r0": 3.5,
6+
"calibrationDate": "2020-04-18",
7+
"calibrationCaseCount": 1400,
8+
"calibrationDeathCount": 200,
9+
"interventionPeriods": [
10+
{
11+
"startDate": "2020-03-15",
12+
"reductionPopulationContact": 15,
13+
"socialDistancing": "moderate"
14+
},
15+
{
16+
"startDate": "2020-03-21",
17+
"reductionPopulationContact": 65,
18+
"socialDistancing": "moderate",
19+
"schoolClosure": "aggressive"
20+
},
21+
{
22+
"startDate": "2020-03-25",
23+
"reductionPopulationContact": 90,
24+
"socialDistancing": "aggressive",
25+
"schoolClosure": "aggressive"
26+
},
27+
{
28+
"startDate": "2020-05-01",
29+
"reductionPopulationContact": 50,
30+
"socialDistancing": "moderate",
31+
"schoolClosure": "mild"
32+
},
33+
{
34+
"startDate": "2020-06-01",
35+
"reductionPopulationContact": 0
36+
}
37+
],
38+
"r0": null
5339
}
5440
}

‎packages/neherlab-covid-19-scenarios/test/test-job.json

Lines changed: 36 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,39 @@
11
{
2-
"id": "my-model-run-id",
3-
"callbackURL": null,
4-
"models": [
5-
{
6-
"slug": "basel",
7-
"imageURL": "docker.pkg.github.com/covid-modeling/model-runner/neherlab-covid-19-scenarios-connector:latest"
8-
}
9-
],
10-
"configuration": {
11-
"region": "US",
12-
"subregion": "US-NY",
13-
"parameters": {
14-
"calibrationDate": "2020-04-18",
15-
"calibrationCaseCount": 1400,
16-
"calibrationDeathCount": 200,
17-
"interventionPeriods": [
18-
{
19-
"startDate": "2020-03-15",
20-
"reductionPopulationContact": 15,
21-
"socialDistancing": "moderate"
22-
},
23-
{
24-
"startDate": "2020-03-21",
25-
"reductionPopulationContact": 65,
26-
"socialDistancing": "moderate",
27-
"schoolClosure": "aggressive"
28-
},
29-
{
30-
"startDate": "2020-03-25",
31-
"reductionPopulationContact": 90,
32-
"socialDistancing": "aggressive",
33-
"schoolClosure": "aggressive"
34-
},
35-
{
36-
"startDate": "2020-05-01",
37-
"reductionPopulationContact": 50,
38-
"socialDistancing": "moderate",
39-
"schoolClosure": "mild"
40-
},
41-
{
42-
"startDate": "2020-06-01",
43-
"reductionPopulationContact": 0
44-
}
45-
],
46-
"r0": null
47-
}
2+
"region": "US",
3+
"subregion": "US-NY",
4+
"parameters": {
5+
"calibrationDate": "2020-04-18",
6+
"calibrationCaseCount": 1400,
7+
"calibrationDeathCount": 200,
8+
"interventionPeriods": [
9+
{
10+
"startDate": "2020-03-15",
11+
"reductionPopulationContact": 15,
12+
"socialDistancing": "moderate"
13+
},
14+
{
15+
"startDate": "2020-03-21",
16+
"reductionPopulationContact": 65,
17+
"socialDistancing": "moderate",
18+
"schoolClosure": "aggressive"
19+
},
20+
{
21+
"startDate": "2020-03-25",
22+
"reductionPopulationContact": 90,
23+
"socialDistancing": "aggressive",
24+
"schoolClosure": "aggressive"
25+
},
26+
{
27+
"startDate": "2020-05-01",
28+
"reductionPopulationContact": 50,
29+
"socialDistancing": "moderate",
30+
"schoolClosure": "mild"
31+
},
32+
{
33+
"startDate": "2020-06-01",
34+
"reductionPopulationContact": 0
35+
}
36+
],
37+
"r0": null
4838
}
4939
}

0 commit comments

Comments
 (0)