green-coding-solutions · ArneTR · Dec 9, 2025
diff --git a/lib/schema_checker.py b/lib/schema_checker.py
@@ -57,12 +57,6 @@ def validate_compose_include(self, value):
 
         return value
 
-    def valid_service_types(self, value):
-        if value != 'container':
-            raise SchemaError(f"{value} is not 'container'")
-        return value
-
-
     def validate_networks_no_invalid_chars(self, value):
         if isinstance(value, list):
             for item in value:
@@ -105,7 +99,6 @@ def check_usage_scenario(self, usage_scenario):
                     Optional('restart'): str, # is part of compose. we ignore it as GMT has own orchestration
                     Optional('expose'): [str, int], # is part of compose. we ignore it as it is non functionaly anyway
                     Optional('init'): bool,
-                    Optional('type'): Use(self.valid_service_types),
                     Optional('image'): And(str, Use(self.not_empty)),
                     Optional('build'): Or(
                         And(str, Use(self.not_empty)),

diff --git a/tests/data/bare-metal/usage_scenario.yml b/tests/data/bare-metal/usage_scenario.yml
@@ -6,7 +6,6 @@ description: Run GMT Tests inside systemd and DinD compatible sysbox-runc contai
 
 services:
   ubuntu-systemd-docker:
-    type: container
     image: greencoding/ubuntu-systemd-docker
 
 flow:

diff --git a/tests/data/bare-metal/usage_scenario_enterprise.yml b/tests/data/bare-metal/usage_scenario_enterprise.yml
@@ -6,7 +6,6 @@ description: Run GMT Tests inside systemd and DinD compatible sysbox-runc contai
 
 services:
   ubuntu-systemd-docker:
-    type: container
     image: greencoding/ubuntu-systemd-docker
 
 flow:

diff --git a/tests/data/metrics/README.md b/tests/data/metrics/README.md
@@ -10,13 +10,11 @@ description: test
 
 services:
   test-container:
-    type: container
     image: alpine
     setup-commands:
       - command: apk add stress-ng
 
   net-container:
-    type: container
     image: alpine
     setup-commands:
       - command: apk add curl

diff --git a/tests/data/stress-application/usage_scenario.yml b/tests/data/stress-application/usage_scenario.yml
@@ -15,7 +15,6 @@ networks:
 
 services:
   ubuntu-stress:
-    type: container
     image: gcb_stress
     networks:
       - network-for-pytests
@@ -24,7 +23,6 @@ services:
       dockerfile: Dockerfile
 
   ubuntu-stress-2:
-    type: container
     image: gcb_stress # this will reuse the image earlier built
     networks:
       - network-for-pytests

diff --git a/tests/data/usage_scenarios/basic_stress.yml b/tests/data/usage_scenarios/basic_stress.yml
@@ -5,7 +5,6 @@ description: test
 
 services:
   test-container:
-    type: container
     image: gcb_stress
     build:
       context: ../stress-application

diff --git a/tests/data/usage_scenarios/basic_stress_with_variables.yml b/tests/data/usage_scenarios/basic_stress_with_variables.yml
@@ -5,7 +5,6 @@ description: test
 
 services:
   test-container:
-    type: container
     image: gcb_stress
     build:
       context: ../stress-application

diff --git a/tests/data/usage_scenarios/capture_logs.yml b/tests/data/usage_scenarios/capture_logs.yml
@@ -5,7 +5,6 @@ description: Capture logs from stdout and sterr
 
 services:
   test-container:
-    type: container
     image: alpine
     setup-commands:
       - command: echo "Test log from setup-commands"

diff --git a/tests/data/usage_scenarios/capture_logs_with_invalid_character.yml b/tests/data/usage_scenarios/capture_logs_with_invalid_character.yml
@@ -5,7 +5,6 @@ description: Test handling of invalid UTF-8 character in log output
 
 services:
   test-container:
-    type: container
     image: alpine
     setup-commands:
       - command: 'printf "Setup log with invalid UTF-8 character: \xff embedded\n"'

diff --git a/tests/data/usage_scenarios/capture_logs_with_null_bytes.yml b/tests/data/usage_scenarios/capture_logs_with_null_bytes.yml
@@ -5,7 +5,6 @@ description: Test handling of null bytes in log output
 
 services:
   test-container:
-    type: container
     image: alpine
     setup-commands:
       - command: 'printf "Setup log with null byte: \x00 embedded\n"'

diff --git a/tests/data/usage_scenarios/cmd_stress.yml b/tests/data/usage_scenarios/cmd_stress.yml
@@ -6,7 +6,6 @@ description: test
 
 services:
   test-container:
-    type: container
     image: gcb_stress
     build:
       context: ../stress-application

diff --git a/tests/data/usage_scenarios/dependency_collection.yml b/tests/data/usage_scenarios/dependency_collection.yml
@@ -5,7 +5,6 @@ description: Test Dependency Resolving
 
 services:
   test-container:
-    type: container
     image: greencoding/gcb_playwright:v20
     setup-commands:
       - shell: bash

diff --git a/tests/data/usage_scenarios/entrypoint_empty.yml b/tests/data/usage_scenarios/entrypoint_empty.yml
@@ -5,7 +5,6 @@ description: test
 
 services:
   test-container:
-    type: container
     image: gcb_stress_entrypoint # image with an endpoint
     build:
       context: ../entrypoint-application

diff --git a/tests/data/usage_scenarios/entrypoint_script.yml b/tests/data/usage_scenarios/entrypoint_script.yml
@@ -5,7 +5,6 @@ description: test
 
 services:
   test-container:
-    type: container
     image: gcb_stress_entrypoint # image with an endpoint
     build:
       context: ../entrypoint-application

diff --git a/tests/data/usage_scenarios/entrypoint_with_command.yml b/tests/data/usage_scenarios/entrypoint_with_command.yml
@@ -5,7 +5,6 @@ description: test
 
 services:
   test-container:
-    type: container
     image: gcb_stress_entrypoint # image with an endpoint
     build:
       context: ../entrypoint-application

diff --git a/tests/data/usage_scenarios/env_vars_stress_allowed.yml b/tests/data/usage_scenarios/env_vars_stress_allowed.yml
@@ -6,7 +6,6 @@ description: test
 
 services:
   test-container:
-    type: container
     image: gcb_stress
     build:
       context: ../stress-application

diff --git a/tests/data/usage_scenarios/env_vars_stress_forbidden.yml b/tests/data/usage_scenarios/env_vars_stress_forbidden.yml
@@ -5,7 +5,6 @@ description: test
 
 services:
   test-container:
-    type: container
     image: gcb_stress
     build:
       context: ../stress-application

diff --git a/tests/data/usage_scenarios/import_one_services.yml b/tests/data/usage_scenarios/import_one_services.yml
@@ -1,2 +1 @@
 test-container:
-  type: container
diff --git a/tests/data/usage_scenarios/internal_network.yml b/tests/data/usage_scenarios/internal_network.yml
@@ -9,7 +9,6 @@ networks:
 
 services:
   test-container:
-    type: container
     image: alpine/curl
     networks: 
       - gmt-test-network

diff --git a/tests/data/usage_scenarios/labels_stress_allowed.yml b/tests/data/usage_scenarios/labels_stress_allowed.yml
@@ -5,7 +5,6 @@ description: test
 
 services:
   test-container:
-    type: container
     image: gcb_stress
     build:
       context: ../stress-application

diff --git a/tests/data/usage_scenarios/labels_stress_forbidden.yml b/tests/data/usage_scenarios/labels_stress_forbidden.yml
@@ -5,7 +5,6 @@ description: test
 
 services:
   test-container:
-    type: container
     image: gcb_stress
     build:
       context: ../stress-application

diff --git a/tests/data/usage_scenarios/metric_providers_data.yml b/tests/data/usage_scenarios/metric_providers_data.yml
@@ -9,7 +9,6 @@ services:
     command: sh
 
   stress-container:
-    type: container
     image: gcb_stress
     build:
       context: ../stress-application

diff --git a/tests/data/usage_scenarios/network_alias.yml b/tests/data/usage_scenarios/network_alias.yml
@@ -8,7 +8,6 @@ networks:
 
 services:
   test-container:
-    type: container
     image: gcb_stress
     build:
       context: ../stress-application

diff --git a/tests/data/usage_scenarios/network_host_create.yml b/tests/data/usage_scenarios/network_host_create.yml
@@ -5,7 +5,6 @@ description: test
 
 services:
   test-container:
-    type: container
     image: gcb_stress
     build:
       context: ../stress-application

diff --git a/tests/data/usage_scenarios/network_host_join.yml b/tests/data/usage_scenarios/network_host_join.yml
@@ -5,7 +5,6 @@ description: test
 
 services:
   test-container:
-    type: container
     image: gcb_stress
     build:
       context: ../stress-application

diff --git a/tests/data/usage_scenarios/network_stress.yml b/tests/data/usage_scenarios/network_stress.yml
@@ -9,7 +9,6 @@ networks:
 
 services:
   test-container:
-    type: container
     image: gcb_stress
     build:
       context: ../stress-application

diff --git a/tests/data/usage_scenarios/noop.yml b/tests/data/usage_scenarios/noop.yml
@@ -5,7 +5,6 @@ description: Testing Noop
 
 services:
   test-container:
-    type: container
     image: alpine
 
 flow:

diff --git a/tests/data/usage_scenarios/port_bindings_stress.yml b/tests/data/usage_scenarios/port_bindings_stress.yml
@@ -6,7 +6,6 @@ description: test
 
 services:
   test-container:
-    type: container
     image: gcb_stress
     build:
       context: ../stress-application

diff --git a/tests/data/usage_scenarios/resource_limits_cpu_none.yml b/tests/data/usage_scenarios/resource_limits_cpu_none.yml
@@ -6,7 +6,6 @@ description: test
 services:
 
   test-container-memory-int:
-    type: container
     image: alpine
     cpus: null
 

diff --git a/tests/data/usage_scenarios/resource_limits_disalign_cpu.yml b/tests/data/usage_scenarios/resource_limits_disalign_cpu.yml
@@ -6,7 +6,6 @@ description: test
 services:
 
   test-container-memory-int:
-    type: container
     image: alpine
     deploy:
       resources:

diff --git a/tests/data/usage_scenarios/resource_limits_disalign_memory.yml b/tests/data/usage_scenarios/resource_limits_disalign_memory.yml
@@ -6,7 +6,6 @@ description: test
 services:
 
   test-container-memory-int:
-    type: container
     image: alpine
     deploy:
       resources:

diff --git a/tests/data/usage_scenarios/resource_limits_good.yml b/tests/data/usage_scenarios/resource_limits_good.yml
@@ -5,23 +5,20 @@ description: test
 
 services:
   test-container-only-cpu:
-    type: container
     image: alpine
     deploy:
       resources:
         limits:
           cpus: "1.2"
 
   test-container-only-memory:
-    type: container
     image: alpine
     deploy:
       resources:
         limits:
           memory: "100MB"
 
   test-container-both:
-    type: container
     image: alpine
     deploy:
       resources:
@@ -30,7 +27,6 @@ services:
           memory: "10M"
 
   test-container-cpu-float:
-    type: container
     image: alpine
     deploy:
       resources:
@@ -39,7 +35,6 @@ services:
           memory: "10M"
 
   test-container-cpu-int:
-    type: container
     image: alpine
     deploy:
       resources:
@@ -48,7 +43,6 @@ services:
           memory: "10M"
 
   test-container-memory-int:
-    type: container
     image: alpine
     deploy:
       resources:
@@ -58,7 +52,6 @@ services:
 
 
   test-container-memory-float:
-    type: container
     image: alpine
     deploy:
       resources:
@@ -67,12 +60,10 @@ services:
           memory: 10000001.23
 
   test-container-limits-partial:
-    type: container
     image: alpine
     deploy: # allowed to be None
 
   test-container-cpu-and-memory-in-both:
-    type: container
     image: alpine
     deploy:
       resources:
@@ -83,20 +74,17 @@ services:
     mem_limit: "10M"
 
   test-container-limit-only-service-level:
-    type: container
     image: alpine
     cpus: 1
     mem_limit: "10M"
 
 
   test-container-limit-only-service-level-memory-int:
-    type: container
     image: alpine
     cpus: 1
     mem_limit: 11000000
 
   test-container-limit-only-service-level-memory-float:
-    type: container
     image: alpine
     cpus: 1
     mem_limit: 10000001.23

diff --git a/tests/data/usage_scenarios/resource_limits_memory_float.yml b/tests/data/usage_scenarios/resource_limits_memory_float.yml
@@ -6,7 +6,6 @@ description: test
 services:
 
   test-container-memory-int:
-    type: container
     image: alpine
     deploy:
       resources:

diff --git a/tests/data/usage_scenarios/resource_limits_memory_none.yml b/tests/data/usage_scenarios/resource_limits_memory_none.yml
@@ -6,7 +6,6 @@ description: test
 services:
 
   test-container-memory-int:
-    type: container
     image: alpine
     deploy:
       resources:

diff --git a/tests/data/usage_scenarios/resource_limits_shm_good.yml b/tests/data/usage_scenarios/resource_limits_shm_good.yml
@@ -5,7 +5,6 @@ description: Testing SHM
 
 services:
   test-container:
-    type: container
     image: alpine
     deploy:
       resources:
@@ -16,7 +15,6 @@ services:
     shm_size: "30MB"
 
   test-container-2:
-    type: container
     image: alpine
     deploy:
       resources:

diff --git a/tests/data/usage_scenarios/runner_filename/basic_stress_1.yml b/tests/data/usage_scenarios/runner_filename/basic_stress_1.yml
@@ -5,7 +5,6 @@ description: test
 
 services:
   test-container:
-    type: container
     image: gcb_stress
     build:
       context: ../../stress-application