chore: fx fixes (#67)

mojaloop · Jun 27, 2024 · 4c4cc76 · 4c4cc76
1 parent 979e7ad
commit 4c4cc76
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 28 deletions.
diff --git a/k8s-mojaloop-perf-tuning/job-setup.yaml b/k8s-mojaloop-perf-tuning/job-setup.yaml
@@ -61,10 +61,10 @@ spec:
                 -u http://moja-ml-testing-toolkit-backend:5050 \
                 --report-format html \
                 --report-auto-filename-enable true \
-                --extra-summary-information="Test Suite:Provisioning,Environment:dev1.devbaremetal1.moja-onprem.net" \
+                --extra-summary-information="Test Suite:Provisioning,Environment:dev1.devbaremetal.moja-onprem.net" \
                 --save-report true \
                 --report-name standard_provisioning_collection \
-                --save-report-base-url http://ttkbackend.dev1.devbaremetal1.moja-onprem.net;
+                --save-report-base-url http://ttkbackend.dev1.devbaremetal.moja-onprem.net;
               export TEST_RUNNER_EXIT_CODE="$?";
 
               echo "Test Runner finished with exit code:

diff --git a/k8s-mojaloop-perf-tuning/patch.sh b/k8s-mojaloop-perf-tuning/patch.sh
@@ -35,17 +35,17 @@ disabled)
 ;;
 schema)
     echo "schema creation"
-    export LEDGER_TAG=v17.6.2
-    kubectl patch deployment --kubeconfig k8s.yaml --namespace mojaloop moja-centralledger-service                  -p "$(envsubst <$DIR/ledger-service.yaml)"
+    export LEDGER_TAG=v17.7.0-snapshot.14
+    kubectl patch deployment --namespace mojaloop moja-centralledger-service                  -p "$(envsubst <$DIR/ledger-service.yaml)"
     sleep 10 # wait for schema creation
-    kubectl scale            --kubeconfig k8s.yaml --namespace mojaloop deployment/moja-centralledger-service       --replicas=8
+    kubectl scale            --namespace mojaloop deployment/moja-centralledger-service       --replicas=8
     exit 0
 ;;
 init)
     echo "installing RedPanda"
-    kubectl apply --kubeconfig k8s.yaml -f "$DIR/redpanda-app.yaml"
+    kubectl apply -f "$DIR/redpanda-app.yaml"
     sleep 10
-    kubectl apply --kubeconfig k8s.yaml -f "$DIR/redpanda-service.yaml"
+    kubectl apply -f "$DIR/redpanda-service.yaml"
     exit 0
 ;;
 *)

diff --git a/packages/k6-tests/config-k8s/fspiopFXQuotes.json b/packages/k6-tests/config-k8s/fspiopFXQuotes.json
@@ -1,6 +1,6 @@
 {
   "scenarios": {
-    "fspiopQuotes": {
+    "fspiopFXQuotes": {
       "executor": "ramping-vus",
       "exec": "fspiopFXQuotesScenarios",
       "env": {

diff --git a/packages/k6-tests/config-k8s/fspiopFXQuotesRampingRate.json b/packages/k6-tests/config-k8s/fspiopFXQuotesRampingRate.json
@@ -1,6 +1,6 @@
 {
   "scenarios": {
-    "fspiopQuotes": {
+    "fspiopFXQuotes": {
       "executor": "ramping-arrival-rate",
       "exec": "fspiopFXQuotesScenarios",
       "env": {

diff --git a/packages/k6-tests/config-k8s/fspiopFXTransfers.json b/packages/k6-tests/config-k8s/fspiopFXTransfers.json
@@ -1,6 +1,6 @@
 {
   "scenarios": {
-    "fspiopTransfers": {
+    "fspiopFXTransfers": {
       "executor": "ramping-vus",
       "exec": "fspiopFXTransfersScenarios",
       "env": {

diff --git a/packages/k6-tests/config-k8s/fspiopFXTransfersRampingRate.json b/packages/k6-tests/config-k8s/fspiopFXTransfersRampingRate.json
@@ -1,6 +1,6 @@
 {
   "scenarios": {
-    "fspiopTransfers": {
+    "fspiopFXTransfers": {
       "executor": "ramping-arrival-rate",
       "exec": "fspiopFXTransfersScenarios",
       "env": {

diff --git a/perf-test.sh b/perf-test.sh
@@ -37,7 +37,7 @@ quotesrate)
     env K6_SCRIPT_CONFIG_FILE_NAME=fspiopQuotesRampingRate.json docker compose --project-name load -f docker-compose-load.yml up -d
 ;;
 fxquotesrate)
-    echo "Testing quotes with ramping rates"
+    echo "Testing FX quotes with ramping rates"
     env K6_SCRIPT_CONFIG_FILE_NAME=fspiopFXQuotesRampingRate.json docker compose --project-name load -f docker-compose-load.yml up -d
 ;;
 transfer)
@@ -65,11 +65,11 @@ fxtransfersrate)
     env K6_SCRIPT_CONFIG_FILE_NAME=fspiopFXTransfersRampingRate.json docker compose --project-name load -f docker-compose-load.yml up -d
 ;;
 dqtrate)
-    echo "Testing account discoveries, quotes and transfers in parallel with constant rates"
+    echo "Testing account discoveries, quotes and transfers in parallel with ramping rates"
     env K6_SCRIPT_CONFIG_FILE_NAME=fspiopDQTRampingRate.json docker compose --project-name load -f docker-compose-load.yml up -d
 ;;
 dfxrate)
-    echo "Testing account discoveries, FX quotes and FX transfers in parallel with constant rates"
+    echo "Testing account discoveries, FX quotes and FX transfers in parallel with ramping rates"
     env K6_SCRIPT_CONFIG_FILE_NAME=fspiopDFXRampingRate.json docker compose --project-name load -f docker-compose-load.yml up -d
 ;;
 e2e)
@@ -89,7 +89,7 @@ simstop)
     docker compose --project-name simulators -f docker-compose-perf.yml --profile 8dfsp --profile testing-toolkit --profile oracle down -v
 ;;
 simrestart)
-    echo "Restartung the simulators"
+    echo "Restarting the simulators"
     docker compose --project-name simulators -f docker-compose-perf.yml --profile 8dfsp --profile testing-toolkit --profile oracle down -v
     docker compose --project-name simulators -f docker-compose-perf.yml --profile 8dfsp --profile testing-toolkit --profile ttk-provisioning-remote-k8s --profile oracle up -d
 ;;
@@ -99,19 +99,29 @@ simupdate)
 ;;
 *)
     echo "Usage: "
-    echo "   $0 discovery"
-    echo "   $0 discoveries"
-    echo "   $0 discoveries rate"
-    echo "   $0 quote"
-    echo "   $0 quotes"
-    echo "   $0 transfer"
-    echo "   $0 transfers"
-    echo "   $0 dqt rate"
-    echo "   $0 e2e"
-    echo "   $0 e2e single"
-    echo "   $0 sim start"
-    echo "   $0 sim stop"
-    echo "   $0 sim restart"
+    echo "   $0 discovery         - Test single account discovery"
+    echo "   $0 discoveries       - Test account discoveries"
+    echo "   $0 discoveries rate  - Test account discoveries with ramping rates"
+    echo "   $0 quote             - Test single quote"
+    echo "   $0 quotes            - Test quotes"
+    echo "   $0 quotes rate       - Test quotes with ramping rates"
+    echo "   $0 transfer          - Test single transfer"
+    echo "   $0 transfers         - Test transfers"
+    echo "   $0 transfers rate    - Test transfers with ramping rates"
+    echo "   $0 fx quote          - Test single FX quote"
+    echo "   $0 fx quotes         - Test FX quotes"
+    echo "   $0 fx quotes rate    - Test FX quotes with ramping rates"
+    echo "   $0 fx transfer       - Test single FX transfer"
+    echo "   $0 fx transfers      - Test FX transfers"
+    echo "   $0 fx transfersrate  - Test FX transfers with ramping rates"
+    echo "   $0 dqtrate           - Test account discoveries, quotes and transfers in parallel with ramping rates"
+    echo "   $0 dfxrate           - Test account discoveries, FX quotes and FX transfers in parallel with ramping rates"
+    echo "   $0 e2e               - Test multiple end to end"
+    echo "   $0 e2e single        - Test single end to end"
+    echo "   $0 sim start         - Star the simulators"
+    echo "   $0 sim stop          - Stop the simulators"
+    echo "   $0 sim restart       - Restart the simulators"
+    echo "   $0 sim update        - Update the simulators"
     exit 1
 ;;
 esac