update to remove innereye and mlflow

microsoft · Nov 29, 2024 · 1ce4876 · 1ce4876
1 parent 72da8cf
commit 1ce4876
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/deploy_tre.yml b/.github/workflows/deploy_tre.yml
@@ -36,7 +36,7 @@ jobs:
         ${{ (github.event_name == 'push' && 'extended or extended_aad')
         || 'extended or extended_aad or shared_services or airlock' }}
       environmentName: ${{ github.event.inputs.environment || 'CICD' }}
-      E2E_TESTS_NUMBER_PROCESSES: 5
+      E2E_TESTS_NUMBER_PROCESSES: 3
       DEVCONTAINER_TAG: 'latest'
     secrets:
       AAD_TENANT_ID: ${{ secrets.AAD_TENANT_ID }}

diff --git a/.github/workflows/pr_comment_bot.yml b/.github/workflows/pr_comment_bot.yml
@@ -164,7 +164,7 @@ jobs:
         (needs.pr_comment.outputs.command == 'run-tests-shared-services' && 'shared_services') ||
         (needs.pr_comment.outputs.command == 'run-tests' && '') }}
       environmentName: CICD
-      E2E_TESTS_NUMBER_PROCESSES: 5
+      E2E_TESTS_NUMBER_PROCESSES: 3
       DEVCONTAINER_TAG: ${{ needs.pr_comment.outputs.prRefId }}
     secrets:
       AAD_TENANT_ID: ${{ secrets.AAD_TENANT_ID }}

diff --git a/Makefile b/Makefile
@@ -349,7 +349,7 @@ test-e2e-workspace-services: ## 🧪 Run E2E workspace services tests
 	$(call target_title, "Running E2E workspace services tests") && \
 	$(MAKE) test-e2e-custom SELECTOR=workspace_services
 
-test-e2e-shared-services: ## 🧪 Run E2E shared service tests
+test-e2e-shared-services: ## 🧪 Run E2E shared services tests
 	$(call target_title, "Running E2E shared services tests") && \
 	$(MAKE) test-e2e-custom SELECTOR=shared_services
 

diff --git a/e2e_tests/resources/strings.py b/e2e_tests/resources/strings.py
@@ -18,12 +18,9 @@
 GUACAMOLE_SERVICE = "tre-service-guacamole"
 GITEA_SERVICE = "tre-workspace-service-gitea"
 GUACAMOLE_SERVICE = "tre-service-guacamole"
-INNEREYE_SERVICE = "tre-service-innereye"
 HEALTH_SERVICE = "tre-workspace-service-health"
-MLFLOW_SERVICE = "tre-service-mlflow"
 MYSQL_SERVICE = "tre-workspace-service-mysql"
 OHDSI_SERVICE = "tre-workspace-service-ohdsi"
-
 HEALTH_SERVICE = "tre-workspace-service-health"
 AZURESQL_SERVICE = "tre-workspace-service-azuresql"
 OPENAI_SERVICE = "tre-workspace-service-openai"

diff --git a/e2e_tests/test_workspace_services.py b/e2e_tests/test_workspace_services.py
@@ -10,9 +10,7 @@
 workspace_services = [
     strings.AZUREML_SERVICE,
     strings.GITEA_SERVICE,
-    # strings.INNEREYE_SERVICE,
     # strings.OHDSI_SERVICE,
-    # strings.MLFLOW_SERVICE,
     strings.MYSQL_SERVICE,
     strings.HEALTH_SERVICE,
     strings.AZURESQL_SERVICE,