Removing obsolete COPU and Memory paramters from tests

unity-sds · Jan 7, 2025 · 629d327 · 629d327
1 parent 944e3ad
commit 629d327
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 31 deletions.
diff --git a/ogc-application-packages/cwl_dag.json b/ogc-application-packages/cwl_dag.json
@@ -27,15 +27,6 @@
         },
         "title": "CWL Workflow URL"
       },
-      "request_cpu": {
-        "description": "The number of CPU cores requested for the job",
-        "maxOccurs": 1,
-        "minOccurs": 1,
-        "schema": {
-          "type": "string"
-        },
-        "title": "Requested CPU"
-      },
       "request_instance_type": {
         "description": "The specific EC2 instance type requested for the job",
         "maxOccurs": 1,
@@ -45,16 +36,6 @@
         },
         "title": "Requested EC2 Type"
       },
-      "request_memory": {
-        "default": "8Gi",
-        "description": "The amount of memory requested for the job",
-        "maxOccurs": 1,
-        "minOccurs": 1,
-        "schema": {
-          "type": "string"
-        },
-        "title": "Requested Memory"
-      },
       "request_storage": {
         "description": "The amount of storage requested for the job",
         "maxOccurs": 1,

diff --git a/unity-test/system/integration/step_defs/test_cwl_workflows_with_airflow_api.py b/unity-test/system/integration/step_defs/test_cwl_workflows_with_airflow_api.py
@@ -28,8 +28,6 @@
             # "test": "https://raw.githubusercontent.com/GodwinShen/emit-ghg/refs/heads/main"
             # "/test/emit-ghg-test.json",
         },
-        "request_memory": "32Gi",
-        "request_cpu": "8",
         "request_storage": "100Gi",
         # r7i.2xlarge: 8 CPUs, 64 GB memory
         "request_instance_type": "r7i.2xlarge",
@@ -42,8 +40,6 @@
             "dev": "https://raw.githubusercontent.com/unity-sds/"
             "sbg-workflows/refs/heads/main/L1-to-L2-e2e.dev.yml",
         },
-        "request_memory": "64Gi",
-        "request_cpu": "32",
         "request_storage": "100Gi",
         # c6i.8xlarge: 32 CPUs, 64 GB memory
         "request_instance_type": "c6i.8xlarge",
@@ -58,8 +54,6 @@
             "test": "https://raw.githubusercontent.com/unity-sds/sbg-workflows/main/preprocess"
             "/sbg-preprocess-workflow.test.yml",
         },
-        "request_memory": "16Gi",
-        "request_cpu": "4",
         "request_storage": "10Gi",
         # c6i.xlarge: 4vCPUs, 8 GB memory
         # r7i.xlarge: 4 CPUs 32 GB memory

diff --git a/unity-test/system/integration/step_defs/test_cwl_workflows_with_ogc_api.py b/unity-test/system/integration/step_defs/test_cwl_workflows_with_ogc_api.py
@@ -26,8 +26,6 @@
             "cwl_args": {
                 "dev": "https://raw.githubusercontent.com/GodwinShen/emit-ghg/refs/heads/main/test/emit-ghg-dev.json"
             },
-            "request_memory": "32Gi",
-            "request_cpu": "8",
             "request_storage": "100Gi",
             # r7i.2xlarge: 8 CPUs, 64 GB memory
             "request_instance_type": "r7i.2xlarge",
@@ -45,8 +43,6 @@
                 "test": "https://raw.githubusercontent.com/unity-sds/sbg-workflows/main/preprocess"
                 "/sbg-preprocess-workflow.test.yml",
             },
-            "request_memory": "16Gi",
-            "request_cpu": "4",
             "request_storage": "10Gi",
             # c6i.xlarge: 4vCPUs, 8 GB memory
             # r7i.xlarge: 4 CPUs 32 GB memory
@@ -63,8 +59,6 @@
                 "dev": "https://raw.githubusercontent.com/unity-sds/"
                 "sbg-workflows/refs/heads/main/L1-to-L2-e2e.dev.yml",
             },
-            "request_memory": "64Gi",
-            "request_cpu": "32",
             "request_storage": "100Gi",
             # c6i.8xlarge: 32 CPUs, 64 GB memory
             "request_instance_type": "c6i.8xlarge",