Add unrestricted and base workspace to e2e tests (#3703)

.github/workflows/deploy_tre_reusable.yml

@@ -374,6 +374,8 @@ jobs:
         include:
           - {BUNDLE_TYPE: "workspace",
              BUNDLE_DIR: "./templates/workspaces/base"}
+          - {BUNDLE_TYPE: "workspace",
+             BUNDLE_DIR: "./templates/workspaces/unrestricted"}
           - {BUNDLE_TYPE: "workspace",
              BUNDLE_DIR: "./templates/workspaces/airlock-import-review"}
           - {BUNDLE_TYPE: "workspace_service",
@@ -533,6 +535,8 @@ jobs:
           # bundles type can be inferred from the bundle dir (but this is more explicit)
           - {BUNDLE_TYPE: "workspace",
              BUNDLE_DIR: "./templates/workspaces/base"}
+          - {BUNDLE_TYPE: "workspace",
+             BUNDLE_DIR: "./templates/workspaces/unrestricted"}
           - {BUNDLE_TYPE: "workspace",
              BUNDLE_DIR: "./templates/workspaces/airlock-import-review"}
           - {BUNDLE_TYPE: "workspace_service",

Makefile

@@ -267,6 +267,7 @@ bundle-publish:
 bundle-register:
 	$(call target_title, "Registering ${DIR} bundle") \
 	&& . ${MAKEFILE_DIR}/devops/scripts/check_dependencies.sh porter,env \
+	&& . ${MAKEFILE_DIR}/devops/scripts/set_docker_sock_permission.sh \
 	&& az acr login --name ${ACR_NAME}	\
 	&& ${MAKEFILE_DIR}/devops/scripts/ensure_cli_signed_in.sh $${TRE_URL} \
 	&& cd ${DIR} \

e2e_tests/resources/strings.py

@@ -10,6 +10,7 @@ API_WORKSPACE_SERVICES = "workspace-services"
 API_USER_RESOURCES = "user-resources"
 
 BASE_WORKSPACE = "tre-workspace-base"
+UNRESTRICTED_WORKSPACE = "tre-workspace-unrestricted"
 AIRLOCK_IMPORT_REVIEW_WORKSPACE = "tre-workspace-airlock-import-review"
 
 AZUREML_SERVICE = "tre-service-azureml"

e2e_tests/test_workspace_templates.py

@@ -13,7 +13,9 @@ pytestmark = pytest.mark.asyncio
 
 
 workspace_templates = [
-    (strings.BASE_WORKSPACE)
+    (strings.BASE_WORKSPACE),
+    (strings.UNRESTRICTED_WORKSPACE),
+    (strings.AIRLOCK_IMPORT_REVIEW_WORKSPACE)
 ]