diff --git a/docker-compose-perf.yml b/docker-compose-perf.yml index f7596f5e..0f8299ab 100644 --- a/docker-compose-perf.yml +++ b/docker-compose-perf.yml @@ -818,7 +818,7 @@ services: command: - sh - -c - - "npm run cli -- -u http://mojaloop-testing-toolkit:5050 -l 2 -i collections/provisioning -e environments/default-env.json --save-report --report-format html --report-target file://reports/ttk-provisioning-report.html" + - "npm run cli -- -u http://mojaloop-testing-toolkit:5050 -l 2 -i collections/provisioning -e environments/default-env.json --labels std,perf --save-report --report-format html --report-target file://reports/ttk-provisioning-report.html" user: root profiles: - ttk-provisioning-transfers @@ -842,7 +842,7 @@ services: command: - sh - -c - - "npm run cli -- -u http://mojaloop-testing-toolkit:5050 -l 2 -i collections/provisioning -e environments/default-env.json --save-report --report-format html --report-target file://reports/ttk-provisioning-report.html" + - "npm run cli -- -u http://mojaloop-testing-toolkit:5050 -l 2 -i collections/provisioning -e environments/default-env.json --labels std,perf --save-report --report-format html --report-target file://reports/ttk-provisioning-report.html" user: root profiles: - ttk-provisioning-quotes @@ -866,7 +866,7 @@ services: command: - sh - -c - - "npm run cli -- -u http://mojaloop-testing-toolkit:5050 -l 2 -i collections/provisioning -e environments/perf-e2e-env.json --save-report --report-format html --report-target file://reports/ttk-provisioning-report.html" + - "npm run cli -- -u http://mojaloop-testing-toolkit:5050 -l 2 -i collections/provisioning -e environments/perf-e2e-env.json --labels std,perf --save-report --report-format html --report-target file://reports/ttk-provisioning-report.html" user: root profiles: - ttk-provisioning-e2e diff --git a/docker-compose.yml b/docker-compose.yml index a366c321..c79183be 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -344,7 +344,7 @@ services: command: - sh - -c - - "npm run cli -- -u http://mojaloop-testing-toolkit:5050 -l 2 -i collections/provisioning -e environments/default-env.json --save-report true --report-format html --report-target file://reports/ttk-provisioning-report.html" + - "npm run cli -- -u http://mojaloop-testing-toolkit:5050 -l 2 -i collections/provisioning -e environments/default-env.json --labels std --save-report true --report-format html --report-target file://reports/ttk-provisioning-report.html" user: root profiles: - ttk-provisioning diff --git a/docker/ml-testing-toolkit/spec_files/user_config.json b/docker/ml-testing-toolkit/spec_files/user_config.json index 59964d0f..366487ba 100644 --- a/docker/ml-testing-toolkit/spec_files/user_config.json +++ b/docker/ml-testing-toolkit/spec_files/user_config.json @@ -65,5 +65,21 @@ "TEST_CASES_REPO_HUB_PROVISIONING_PATH": "collections/dfsp/provisioning" }, "DEFAULT_ENVIRONMENT_FILE_NAME": "default-env.json", - "LABELS": [] + "LABELS": [ + { + "name": "std", + "description": "Standard tests", + "color": "green" + }, + { + "name": "perf", + "description": "Performance characterisation test cases", + "color": "red" + }, + { + "name": "fx", + "description": "Test for foreign exchange functionality", + "color": "blue" + } + ] } \ No newline at end of file diff --git a/docker/ml-testing-toolkit/test-cases/collections/master.json b/docker/ml-testing-toolkit/test-cases/collections/master.json new file mode 100644 index 00000000..c0a46507 --- /dev/null +++ b/docker/ml-testing-toolkit/test-cases/collections/master.json @@ -0,0 +1,16 @@ +{ + "order": [ + { + "name": "provisioning-perf-als", + "type": "folder" + }, + { + "name": "provisioning", + "type": "folder" + }, + { + "name": "tests", + "type": "folder" + } + ] +} \ No newline at end of file diff --git a/docker/ml-testing-toolkit/test-cases/collections/provisioning/hub_setup.json b/docker/ml-testing-toolkit/test-cases/collections/provisioning/hub_setup.json index a5d91e5f..6c7474f1 100644 --- a/docker/ml-testing-toolkit/test-cases/collections/provisioning/hub_setup.json +++ b/docker/ml-testing-toolkit/test-cases/collections/provisioning/hub_setup.json @@ -699,4 +699,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/docker/ml-testing-toolkit/test-cases/collections/provisioning/master.json b/docker/ml-testing-toolkit/test-cases/collections/provisioning/master.json index e7b88b11..c563b980 100644 --- a/docker/ml-testing-toolkit/test-cases/collections/provisioning/master.json +++ b/docker/ml-testing-toolkit/test-cases/collections/provisioning/master.json @@ -2,15 +2,31 @@ "order": [ { "name": "hub_setup.json", - "type": "file" + "type": "file", + "labels": [ + "std" + ] }, { - "name": "participant_testingtoolkitdfsp.json", - "type": "file" + "name": "participant_receiver.json", + "type": "file", + "labels": [ + "std" + ] }, { - "name": "participant_ttkpayeefsp", - "type": "file" + "name": "participant_sender.json", + "type": "file", + "labels": [ + "std" + ] + }, + { + "name": "participants_perf", + "type": "folder", + "labels": [ + "perf" + ] } ] } \ No newline at end of file diff --git a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_sender.json b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_sender.json index 6af8df3a..551308c8 100644 --- a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_sender.json +++ b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_sender.json @@ -1487,4 +1487,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/master.json b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/master.json new file mode 100644 index 00000000..708180cb --- /dev/null +++ b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/master.json @@ -0,0 +1,36 @@ +{ + "order": [ + { + "name": "participant_perffsp1.json", + "type": "file" + }, + { + "name": "participant_perffsp2.json", + "type": "file" + }, + { + "name": "participant_perffsp3.json", + "type": "file" + }, + { + "name": "participant_perffsp4.json", + "type": "file" + }, + { + "name": "participant_perffsp5.json", + "type": "file" + }, + { + "name": "participant_perffsp6.json", + "type": "file" + }, + { + "name": "participant_perffsp7.json", + "type": "file" + }, + { + "name": "participant_perffsp8.json", + "type": "file" + } + ] +} \ No newline at end of file diff --git a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp1.json b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp1.json similarity index 99% rename from docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp1.json rename to docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp1.json index 1651f1cb..efb5afd6 100644 --- a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp1.json +++ b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp1.json @@ -1532,4 +1532,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp2.json b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp2.json similarity index 99% rename from docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp2.json rename to docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp2.json index eff7d172..6f0ef927 100644 --- a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp2.json +++ b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp2.json @@ -1532,4 +1532,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp3.json b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp3.json similarity index 99% rename from docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp3.json rename to docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp3.json index 5738585f..a79c5cd5 100644 --- a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp3.json +++ b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp3.json @@ -1532,4 +1532,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp4.json b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp4.json similarity index 99% rename from docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp4.json rename to docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp4.json index 9f39767d..4c874a9d 100644 --- a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp4.json +++ b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp4.json @@ -1532,4 +1532,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp5.json b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp5.json similarity index 99% rename from docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp5.json rename to docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp5.json index b8ce73bc..33be3613 100644 --- a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp5.json +++ b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp5.json @@ -1532,4 +1532,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp6.json b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp6.json similarity index 99% rename from docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp6.json rename to docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp6.json index 50579855..45a1903a 100644 --- a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp6.json +++ b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp6.json @@ -1532,4 +1532,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp7.json b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp7.json similarity index 99% rename from docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp7.json rename to docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp7.json index 7e2f6ab7..aa4a88f8 100644 --- a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp7.json +++ b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp7.json @@ -1532,4 +1532,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp8.json b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp8.json similarity index 99% rename from docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp8.json rename to docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp8.json index 6c266914..79ab9ee2 100644 --- a/docker/ml-testing-toolkit/test-cases/collections/provisioning/participant_perffsp8.json +++ b/docker/ml-testing-toolkit/test-cases/collections/provisioning/participants_perf/participant_perffsp8.json @@ -1532,4 +1532,4 @@ ] } ] -} +} \ No newline at end of file