chore: cleanup

mojaloop · Sep 20, 2024 · 285c904 · 285c904
1 parent c6e94eb
commit 285c904
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 51 deletions.
diff --git a/local-deployment-methods/helmfile/values-mojaloop-min.yaml b/local-deployment-methods/helmfile/values-mojaloop-min.yaml
@@ -68,12 +68,9 @@ centralledger:
   centralledger-handler-admin-transfer:
     config:
       proxy_cache: *PROXY_CACHE
-ml-ttk-test-setup-proxy:
+ml-ttk-test-setup-interscheme:
   tests:
     enabled: *INTERSCHEME_ENABLED
-ml-ttk-test-val-payer-proxy:
+ml-ttk-test-val-interscheme:
   tests:
     enabled: *INTERSCHEME_ENABLED
-ml-ttk-test-val-payee-proxy:
-  tests:
-    enabled: *INTERSCHEME_ENABLED
diff --git a/mojaloop/Chart.yaml b/mojaloop/Chart.yaml
@@ -128,20 +128,15 @@ dependencies:
     repository: "file://../ml-testing-toolkit-cli"
     condition: ml-ttk-test-val-sdk-r2p.tests.enabled
   - name: ml-testing-toolkit-cli
-    alias: ml-ttk-test-setup-proxy
+    alias: ml-ttk-test-setup-interscheme
     version: ">= 15.6.0"
     repository: "file://../ml-testing-toolkit-cli"
-    condition: ml-ttk-test-setup-proxy.tests.enabled
+    condition: ml-ttk-test-setup-interscheme.tests.enabled
   - name: ml-testing-toolkit-cli
-    alias: ml-ttk-test-val-payer-proxy
+    alias: ml-ttk-test-val-interscheme
     version: ">= 15.6.0"
     repository: "file://../ml-testing-toolkit-cli"
-    condition: ml-ttk-test-val-payer-proxy.tests.enabled
-  - name: ml-testing-toolkit-cli
-    alias: ml-ttk-test-val-payee-proxy
-    version: ">= 15.6.0"
-    repository: "file://../ml-testing-toolkit-cli"
-    condition: ml-ttk-test-val-payee-proxy.tests.enabled
+    condition: ml-ttk-test-val-interscheme.tests.enabled
   - name: ml-testing-toolkit-cli
     alias: ml-ttk-test-cleanup
     version: ">= 15.6.0"

diff --git a/mojaloop/templates/NOTES.txt b/mojaloop/templates/NOTES.txt
@@ -82,16 +82,12 @@ View Test logs with the following commands:
   $ kubectl -n {{ .Release.Namespace }} logs pod/{{ .Release.Name }}-ml-ttk-test-val-sdk-r2p
 {{- end}}
 
-{{- if (index .Values "ml-ttk-test-setup-proxy" "tests" "enabled") }}
-  $ kubectl -n {{ .Release.Namespace }} logs pod/{{ .Release.Name }}-ml-ttk-test-setup-proxy
+{{- if (index .Values "ml-ttk-test-setup-interscheme" "tests" "enabled") }}
+  $ kubectl -n {{ .Release.Namespace }} logs pod/{{ .Release.Name }}-ml-ttk-test-setup-interscheme
 {{- end}}
 
-{{- if (index .Values "ml-ttk-test-val-payer-proxy" "tests" "enabled") }}
-  $ kubectl -n {{ .Release.Namespace }} logs pod/{{ .Release.Name }}-ml-ttk-test-val-payer-proxy
-{{- end}}
-
-{{- if (index .Values "ml-ttk-test-val-payee-proxy" "tests" "enabled") }}
-  $ kubectl -n {{ .Release.Namespace }} logs pod/{{ .Release.Name }}-ml-ttk-test-val-payee-proxy
+{{- if (index .Values "ml-ttk-test-val-interscheme" "tests" "enabled") }}
+  $ kubectl -n {{ .Release.Namespace }} logs pod/{{ .Release.Name }}-ml-ttk-test-val-interscheme
 {{- end}}
 
 {{- if (index .Values "ml-ttk-test-cleanup" "tests" "enabled") }}

diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml
@@ -14378,7 +14378,7 @@ ml-ttk-test-val-sdk-r2p:
     <<: *simNames
   testCaseEnvironmentFile: *ttksim1InputValues
 
-ml-ttk-test-setup-proxy:
+ml-ttk-test-setup-interscheme:
   tests:
     enabled: *INTERSCHEME_ENABLED
     weight: -1
@@ -14394,7 +14394,7 @@ ml-ttk-test-setup-proxy:
     environmentName: Development
     saveReport: true
     saveReportBaseUrl: "testing-toolkit.local"
-    reportName: proxy_provisioning_collection
+    reportName: interscheme_provisioning_collection
     ## `allowFailures` configures this TTK CLI Test Runner to return failure exit-codes to the terminal,
     ## by default this is `false` - which means that any consecutive Helm tests will not be executed by Helm.
     ## If this is set to `true` - it will allow all Helm tests to be executed regardless of any failures.
@@ -14403,14 +14403,14 @@ ml-ttk-test-setup-proxy:
     <<: *simNames
   testCaseEnvironmentFile: *ttksim1InputValues
 
-ml-ttk-test-val-payer-proxy:
+ml-ttk-test-val-interscheme:
   tests:
     enabled: *INTERSCHEME_ENABLED
     weight: 0
   config:
     ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases
     testCasesZipUrl: *ttkGitUrl
-    testCasesPathInZip: testing-toolkit-test-cases-16.1.0-fx-snapshot.39/collections/hub/inter_scheme/as_payer_scheme
+    testCasesPathInZip: testing-toolkit-test-cases-16.1.0-fx-snapshot.39/collections/hub/inter_scheme
     ## Optional config for uploading reports to S3 Buckets. If enabled: WS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION under the 'configCreds' is required.
     # awsS3BucketName: aws-s3-bucket-name
     # awsS3FilePath: ttk-tests/reports
@@ -14419,31 +14419,7 @@ ml-ttk-test-val-payer-proxy:
     environmentName: Development
     saveReport: true
     saveReportBaseUrl: "testing-toolkit.local"
-    reportName: proxy_gp_collection_payer
-    ## `allowFailures` configures this TTK CLI Test Runner to return failure exit-codes to the terminal,
-    ## by default this is `false` - which means that any consecutive Helm tests will not be executed by Helm.
-    ## If this is set to `true` - it will allow all Helm tests to be executed regardless of any failures.
-    allowFailures: false
-  parameters:
-    <<: *simNames
-  testCaseEnvironmentFile: *ttkInputValues
-ml-ttk-test-val-payee-proxy:
-  tests:
-    enabled: *INTERSCHEME_ENABLED
-    weight: 1
-  config:
-    ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases
-    testCasesZipUrl: *ttkGitUrl
-    testCasesPathInZip: testing-toolkit-test-cases-16.1.0-fx-snapshot.39/collections/hub/inter_scheme/as_payee_scheme
-    ## Optional config for uploading reports to S3 Buckets. If enabled: WS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION under the 'configCreds' is required.
-    # awsS3BucketName: aws-s3-bucket-name
-    # awsS3FilePath: ttk-tests/reports
-    ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050
-    testSuiteName: Proxy GP Collection (Payee)
-    environmentName: Development
-    saveReport: true
-    saveReportBaseUrl: "testing-toolkit.local"
-    reportName: proxy_gp_collection_payee
+    reportName: interscheme_gp_collection
     ## `allowFailures` configures this TTK CLI Test Runner to return failure exit-codes to the terminal,
     ## by default this is `false` - which means that any consecutive Helm tests will not be executed by Helm.
     ## If this is set to `true` - it will allow all Helm tests to be executed regardless of any failures.