Support GCP Functions gen2

.github/workflows/_regression-job.yml

@@ -58,7 +58,7 @@ jobs:
           uv pip install .
 
       - name: Run regression tests
-        timeout-minutes: 10
+        timeout-minutes: 20
         run: |
           source .venv/bin/activate
           uv run sebs benchmark regression test \

configs/cpp.json

@@ -5,7 +5,7 @@
     "update_storage": false,
     "download_results": false,
     "architecture": "x64",
-    "container_deployment": true,
+    "system_variant": "package",
     "runtime": {
       "language": "cpp",
       "version": "all"

configs/example.json

@@ -4,8 +4,8 @@
     "update_code": false,
     "update_storage": false,
     "download_results": false,
-    "architecture": "x64", 
-    "container_deployment": true,
+    "architecture": "x64",
+    "system_variant": "package",
     "runtime": {
       "language": "python",
       "version": "3.11"

configs/java.json

@@ -5,10 +5,10 @@
     "update_storage": false,
     "download_results": false,
     "architecture": "x64",
-    "container_deployment": false,
+    "system_variant": "package",
     "runtime": {
-        "language": "java",
-        "version": "11"
+      "language": "java",
+      "version": "11"
     },
     "type": "invocation-overhead",
     "perf-cost": {

configs/nodejs.json

@@ -5,7 +5,7 @@
     "update_storage": false,
     "download_results": false,
     "architecture": "x64",
-    "container_deployment": true,
+    "system_variant": "package",
     "runtime": {
       "language": "nodejs",
       "version": "20"

configs/python.json

@@ -5,7 +5,7 @@
     "update_storage": false,
     "download_results": false,
     "architecture": "x64",
-    "container_deployment": true,
+    "system_variant": "package",
     "runtime": {
       "language": "python",
       "version": "3.11"

configs/systems.json

@@ -365,11 +365,11 @@
       }
     },
     "architecture": [
-      "x64",
-      "arm64"
+      "x64"
     ],
     "deployments": [
-      "package",
+      "function-gen1",
+      "function-gen2",
       "container"
     ]
   },

docs/modularity.md

@@ -375,7 +375,7 @@ This function has been retrieved from the cache and requires refreshing function
 In practice, this is often limited to updating logging handlers - see existing implementations for details.
 
 ```python
-    def update_function(self, function: Function, code_package: Benchmark, container_deployment: bool, container_uri: str):
+    def update_function(self, function: Function, code_package: Benchmark, system_variant: SystemVariant, container_uri: str | None):
 ```
 
 This function updates the function's code and configuration in the platform.

docs/platforms.md

@@ -217,12 +217,11 @@ or in the JSON input configuration:
 
 ### Deployment Modes
 
-SeBS models two GCP deployment targets:
+SeBS models three GCP deployment targets:
 
 1. `function-gen1`: the first Google Cloud Functions Gen1 path.
-2. `container`: direct container deployment to Cloud Run.
-
-We plan also to add support for `function-gen2`, the current Google Cloud Functions Gen2 path.
+2. `function-gen2`: Google Cloud Functions Gen2 package deployment.
+3. `container`: direct container deployment to Cloud Run.
 These deployment types intentionally share a single GCP backend in SeBS, but they are not identical in packaging, naming, scaling, or performance behavior.
 
 On GCP, there are two different concurrency layers that should not be confused:
@@ -259,6 +258,37 @@ Gen1 configuration currently exposes instance-scaling controls:
 
 Use Gen1 when you want the most established GCP path in SeBS and do not need container-level runtime tuning.
 
+### Function Gen2
+
+Gen2 reuses the same local ZIP packaging flow as Gen1, but deploys through the Cloud Functions v2 API. It is selected directly through the experiment-level `system_variant`:
+
+```json
+"deployment": {
+  "name": "gcp",
+  "gcp": {
+    "region": "europe-west1",
+    "project_name": "your-gcp-project-id",
+    "credentials": "/path/to/project-credentials.json",
+    "configuration": {
+      "function-gen2": {
+        "vcpus": 1,
+        "gcp-concurrency": 80,
+        "worker-concurrency": 1,
+        "worker-threads": 8,
+        "min-instances": 0,
+        "max-instances": 20,
+        "cpu-boost": false,
+        "cpu-throttle": true
+      }
+    }
+  }
+}
+```
+
+Set `experiments.system_variant` to one of `function-gen1`, `function-gen2`, or `container`. From the CLI and regression workflows, the same selection is exposed through the generic `--system-variant` option.
+
+Gen1 and Gen2 package deployments use separate SeBS cache identities and separate cloud function names with short `-gen1` and `-gen2` suffixes. This avoids control-plane races when switching between package modes. In practice, regression and benchmark runs should still select one GCP package mode at a time for a given run.
+
 ### Cloud Run Container Deployments
 
 Container deployments are the currently implemented Cloud Run-based path in SeBS. They are selected with container deployment and use a provider-specific function image built from `Dockerfile.function`.
@@ -298,7 +328,8 @@ Cloud Run containers can [execute in two environments](https://docs.cloud.google
 
 The current GCP backend has the following practical limits:
 * Gen1 is the primary managed-functions deployment path today.
-* Gen2 is planned and partially modeled in configuration, but not yet fully deployed through a dedicated strategy.
+* Gen2 supports the ZIP package deployment path and HTTP triggers.
+* Library-trigger direct invocation remains Gen1-only.
 * Cloud Run containers are implemented today and provide the most tuning control.
 * GCP deployments currently reject `arm64`, as arm64 instances are not available for GCR.
 * C++ packaging is not supported on GCP (but possible to be implemented on containers).

sebs/aws/aws.py

@@ -29,6 +29,7 @@
 from sebs.benchmark import Benchmark
 from sebs.cache import Cache
 from sebs.config import SeBSConfig
+from sebs.experiments.config import SystemVariant
 from sebs.utils import LoggingHandlers
 from sebs.faas.function import Function, ExecutionResult, Trigger, FunctionConfig
 from sebs.faas.system import System
@@ -191,7 +192,7 @@ def package_code(
         architecture: str,
         benchmark: str,
         is_cached: bool,
-    ) -> Tuple[str, int]:
+    ) -> Tuple[str, float]:
         """
         Package code for deployment to AWS Lambda.
 
@@ -321,7 +322,7 @@ def create_function(
         self,
         code_package: Benchmark,
         func_name: str,
-        container_deployment: bool,
+        system_variant: SystemVariant,
         container_uri: str | None,
     ) -> "LambdaFunction":
         """
@@ -333,8 +334,8 @@ def create_function(
         Args:
             code_package: Benchmark code package
             func_name: Name of the function
-            container_deployment: Whether to use container deployment
-            container_uri: URI of the container image (if container_deployment=True)
+            system_variant: Selected deployment variant
+            container_uri: URI of the container image (if container deployment is selected)
 
         Returns:
             LambdaFunction: The created or updated Lambda function
@@ -366,7 +367,7 @@ def create_function(
                 self.config.resources.lambda_role(self.session),
                 function_cfg,
             )
-            self.update_function(lambda_function, code_package, container_deployment, container_uri)
+            self.update_function(lambda_function, code_package, system_variant, container_uri)
             lambda_function.updated_code = True
             # TODO: get configuration of REST API
         except self.client.exceptions.ResourceNotFoundException:
@@ -379,7 +380,7 @@ def create_function(
                 "Code": {},
             }
 
-            if container_deployment:
+            if system_variant.is_container:
                 create_function_params["PackageType"] = "Image"
                 create_function_params["Code"] = {"ImageUri": container_uri}
                 self.logging.info(
@@ -467,7 +468,7 @@ def update_function(
         self,
         function: Function,
         code_package: Benchmark,
-        container_deployment: bool,
+        system_variant: SystemVariant,
         container_uri: str | None,
     ):
         """
@@ -480,13 +481,13 @@ def update_function(
         Args:
             function: The function to update
             code_package: Benchmark code package
-            container_deployment: Whether to use container deployment
-            container_uri: URI of the container image (if container_deployment=True)
+            system_variant: Selected deployment variant
+            container_uri: URI of the container image (if container deployment is selected)
         """
         name = function.name
         function = cast(LambdaFunction, function)
 
-        if container_deployment:
+        if system_variant.is_container:
             self.client.update_function_code(FunctionName=name, ImageUri=container_uri)
         else:
             code_size = code_package.code_size
@@ -612,7 +613,7 @@ def default_function_name(
             code_package.language_version,
             code_package.architecture,
         )
-        if code_package.container_deployment:
+        if code_package.system_variant.is_container:
             func_name = f"{func_name}-docker"
         return AWS.format_function_name(func_name)
 

sebs/azure/azure.py

@@ -54,6 +54,7 @@
 from sebs.benchmark import Benchmark
 from sebs.cache import Cache
 from sebs.config import SeBSConfig
+from sebs.experiments.config import SystemVariant
 from sebs.utils import LoggingHandlers, execute
 from sebs.faas.function import Function, FunctionConfig, ExecutionResult
 from sebs.faas.system import System
@@ -220,7 +221,7 @@ def package_code(
         architecture: str,
         benchmark: str,
         is_cached: bool,
-    ) -> Tuple[str, int]:
+    ) -> Tuple[str, float]:
         """Package function code for Azure Functions deployment.
 
         Creates the proper directory structure and configuration files
@@ -237,7 +238,7 @@ def package_code(
             architecture: Target architecture (currently unused)
             benchmark: Name of the benchmark
             is_cached: Whether the package is from cache
-            container_deployment: Whether to use container deployment
+            system_variant: Selected deployment variant
 
         Returns:
             Tuple of (directory_path, code_size_bytes, container_uri)
@@ -504,7 +505,7 @@ def update_function(
         self,
         function: Function,
         code_package: Benchmark,
-        container_deployment: bool,
+        system_variant: SystemVariant,
         container_uri: str | None,
     ) -> None:
         """Update existing Azure Function with new code.
@@ -517,14 +518,14 @@ def update_function(
         Args:
             function: Function instance to update
             code_package: New benchmark code package
-            container_deployment: Whether using container deployment
+            system_variant: Selected deployment variant
             container_uri: Container URI (unused for Azure)
 
         Raises:
             NotImplementedError: If container deployment is requested.
         """
 
-        if container_deployment:
+        if system_variant.is_container:
             raise NotImplementedError("Container deployment is not supported in Azure")
 
         assert code_package.has_input_processed
@@ -752,7 +753,7 @@ def create_function(
         self,
         code_package: Benchmark,
         func_name: str,
-        container_deployment: bool,
+        system_variant: SystemVariant,
         container_uri: str | None,
     ) -> AzureFunction:
         """Create new Azure Function.
@@ -764,7 +765,7 @@ def create_function(
         Args:
             code_package: Benchmark code package to deploy
             func_name: Name for the Azure Function App
-            container_deployment: Whether to use container deployment
+            system_variant: Selected deployment variant
             container_uri: Container URI (unused for Azure)
 
         Returns:
@@ -775,7 +776,7 @@ def create_function(
             RuntimeError: If function creation fails.
         """
 
-        if container_deployment:
+        if system_variant.is_container:
             raise NotImplementedError("Container deployment is not supported in Azure")
 
         language = code_package.language_name
@@ -852,7 +853,7 @@ def create_function(
         )
 
         # update existing function app
-        self.update_function(function, code_package, container_deployment, container_uri)
+        self.update_function(function, code_package, system_variant, container_uri)
 
         self.cache_client.add_function(
             deployment_name=self.name(),