ci: allow setting region/zone for e2e tests (#2205)

Signed-off-by: Daniel Weiße <dw@edgeless.systems>

.github/actions/e2e_test/action.yml

@@ -23,6 +23,9 @@ inputs:
     description: "Version of a released CLI to download, e.g. 'v2.3.0', leave empty to build it."
   kubernetesVersion:
     description: "Kubernetes version to create the cluster from."
+  regionZone:
+    description: "Region or zone to use for resource creation"
+    required: false
   gcpProject:
     description: "The GCP project to deploy Constellation in."
     required: true
@@ -190,10 +193,10 @@ runs:
       with:
         cloudProvider: ${{ inputs.cloudProvider }}
         namePrefix: ${{ steps.create-prefix.outputs.prefix }}
-        awsZone: us-east-2c
+        awsZone: ${{ inputs.regionZone || 'us-east-2c' }}
-        azureRegion: northeurope
+        azureRegion: ${{ inputs.regionZone || 'northeurope' }}
         gcpProjectID: ${{ inputs.gcpProject }}
-        gcpZone: europe-west3-b
+        gcpZone: ${{ inputs.regionZone || 'europe-west3-b' }}
         kubernetesVersion: ${{ inputs.kubernetesVersion }}
 
     - name: Login to GCP (Cluster service account)

.github/workflows/e2e-test-manual.yml

@@ -55,6 +55,9 @@ on:
         type: string
         default: "default"
         required: false
+      regionZone:
+        description: "Region or zone to create the cluster in. Leave empty for default region/zone."
+        type: string
       git-ref:
         description: "Git ref to checkout."
         type: string
@@ -96,6 +99,9 @@ on:
         description: "Override VM machine type. Leave as 'default' or empty to use the default VM type for the selected cloud provider."
         type: string
         required: true
+      regionZone:
+        description: "Region or zone to create the cluster in. Leave empty for default region/zone."
+        type: string
       git-ref:
         description: "Git ref to checkout."
         type: string
@@ -232,6 +238,7 @@ jobs:
           controlNodesCount: ${{ needs.split-nodeCount.outputs.controlPlaneNodes }}
           cloudProvider: ${{ inputs.cloudProvider }}
           machineType: ${{ inputs.machineType }}
+          regionZone: ${{ inputs.regionZone }}
           gcpProject: ${{ secrets.GCP_E2E_PROJECT }}
           gcpClusterCreateServiceAccount: "constellation-e2e-cluster@constellation-331613.iam.gserviceaccount.com"
           gcpIAMCreateServiceAccount: "constellation-iam-e2e@constellation-331613.iam.gserviceaccount.com"

.github/workflows/e2e-test-release.yml

@@ -19,6 +19,9 @@ on:
         type: string
         description: "Target version to test"
         required: true
+      regionZone:
+        description: "Region or zone to run e2e tests in. Leave empty for default region/zone."
+        type: string
   workflow_call:
     inputs:
       ref:
@@ -191,6 +194,7 @@ jobs:
           kubernetesVersion: ${{ matrix.kubernetes-version }}
           osImage: ""
           isDebugImage: "false"
+          regionZone: ${{ inputs.regionZone }}
           awsOpenSearchDomain: ${{ secrets.AWS_OPENSEARCH_DOMAIN }}
           awsOpenSearchUsers: ${{ secrets.AWS_OPENSEARCH_USER }}
           awsOpenSearchPwd: ${{ secrets.AWS_OPENSEARCH_PWD }}
@@ -243,6 +247,5 @@ jobs:
       fromVersion: ${{ matrix.fromVersion }}
       toImage: ${{ inputs.targetVersion }}
       cloudProvider: ${{ matrix.cloudProvider }}
-      workerNodesCount: 2
+      nodeCount: '3:2'
-      controlNodesCount: 3
       gitRef: ${{ inputs.ref || github.head_ref }}

.github/workflows/e2e-test-weekly.yml

@@ -264,8 +264,7 @@ jobs:
     with:
       fromVersion: ${{ matrix.fromVersion }}
       cloudProvider: ${{ matrix.cloudProvider }}
-      workerNodesCount: 2
+      nodeCount: '3:2'
-      controlNodesCount: 3
       scheduled: ${{ github.event_name == 'schedule' }}
   e2e-mini:
     name: Run miniconstellation E2E test

.github/workflows/e2e-upgrade.yml

@@ -11,12 +11,10 @@ on:
           - "azure"
           - "aws"
         default: "azure"
-      workerNodesCount:
+      nodeCount:
-        description: "Number of worker nodes to spawn."
+        description: "Number of nodes to use in the cluster. Given in format `<control-plane nodes>:<worker nodes>`."
-        default: "2"
+        default: "3:2"
-      controlNodesCount:
+        type: string
-        description: "Number of control-plane nodes to spawn."
-        default: "3"
       fromVersion:
         description: CLI version to create a new cluster with. This has to be a released version, e.g., 'v2.1.3'.
         type: string
@@ -42,25 +40,19 @@ on:
         description: Enter a version to build the CLI with. This can be used to simulate a patch-upgrade.
         type: string
         required: false
-      scheduled:
+      regionZone:
-        description: Don't set this when triggering manually.
+        description: "Region or zone to create the cluster in. Leave empty for default region/zone."
-        type: boolean
+        type: string
-        default: false
-        required: false
   workflow_call:
     inputs:
       cloudProvider:
         description: "Which cloud provider to use."
         type: string
         required: true
-      workerNodesCount:
+      nodeCount:
-        description: "Number of worker nodes to spawn."
+        description: "Number of nodes to use in the cluster. Given in format `<control-plane nodes>:<worker nodes>`."
-        type: number
+        default: "3:2"
-        required: true
+        type: string
-      controlNodesCount:
-        description: "Number of control-plane nodes to spawn."
-        type: number
-        required: true
       fromVersion:
         description: CLI version to create a new cluster with. This has to be a released version, e.g., 'v2.1.3'.
         type: string
@@ -93,6 +85,32 @@ on:
         required: false
 
 jobs:
+  split-nodeCount:
+    name: Split nodeCount
+    runs-on: ubuntu-22.04
+    permissions:
+      id-token: write
+      contents: read
+    outputs:
+      workerNodes: ${{ steps.split-nodeCount.outputs.workerNodes }}
+      controlPlaneNodes: ${{ steps.split-nodeCount.outputs.controlPlaneNodes }}
+    steps:
+      - name: Split nodeCount
+        id: split-nodeCount
+        shell: bash
+        run: |
+          nodeCount="${{ inputs.nodeCount }}"
+          workerNodes="${nodeCount##*:}"
+          controlPlaneNodes="${nodeCount%%:*}"
+
+          if [[ -z "${workerNodes}" ]] || [[ -z "{controlPlaneNodes}" ]]; then
+            echo "Invalid nodeCount input: '${nodeCount}'."
+            exit 1
+          fi
+
+          echo "workerNodes=${workerNodes}" | tee -a "$GITHUB_OUTPUT"
+          echo "controlPlaneNodes=${controlPlaneNodes}" | tee -a "$GITHUB_OUTPUT"
+
   e2e-upgrade:
     runs-on: ubuntu-22.04
     permissions:
@@ -100,6 +118,7 @@ jobs:
       checks: write
       contents: read
       packages: write
+    needs: [split-nodeCount]
     steps:
       - name: Checkout
         if: inputs.gitRef == 'head'
@@ -139,12 +158,13 @@ jobs:
         id: e2e_test
         uses: ./.github/actions/e2e_test
         with:
-          workerNodesCount: ${{ inputs.workerNodesCount }}
+          workerNodesCount: ${{ needs.split-nodeCount.outputs.workerNodes }}
-          controlNodesCount: ${{ inputs.controlNodesCount }}
+          controlNodesCount: ${{ needs.split-nodeCount.outputs.controlPlaneNodes }}
           cloudProvider: ${{ inputs.cloudProvider }}
           osImage: ${{ inputs.fromVersion }}
           isDebugImage: "false"
           cliVersion: ${{ inputs.fromVersion }}
+          regionZone: ${{ inputs.regionZone }}
           gcpProject: ${{ secrets.GCP_E2E_PROJECT }}
           gcpClusterCreateServiceAccount: "constellation-e2e-cluster@constellation-331613.iam.gserviceaccount.com"
           gcpIAMCreateServiceAccount: "constellation-iam-e2e@constellation-331613.iam.gserviceaccount.com"
@@ -218,8 +238,8 @@ jobs:
           IMAGE: ${{ inputs.toImage && inputs.toImage || steps.find-image.outputs.output }}
           KUBERNETES: ${{ inputs.toKubernetes }}
           MICROSERVICES: ${{ inputs.toMicroservices }}
-          WORKERNODES: ${{ inputs.workerNodesCount }}
+          WORKERNODES:  ${{ needs.split-nodeCount.outputs.workerNodes }}
-          CONTROLNODES: ${{ inputs.controlNodesCount }}
+          CONTROLNODES: ${{ needs.split-nodeCount.outputs.controlPlaneNodes }}
         run: |
           echo "Image target: $IMAGE"
           echo "K8s target: $KUBERNETES"
@@ -278,7 +298,7 @@ jobs:
           failure() &&
           github.ref == 'refs/heads/main' &&
           github.event_name == 'workflow_call' &&
-          inputs.scheduled == 'true'
+          ${{ inputs.scheduled || 'true' }} == 'true'
         continue-on-error: true
         uses: ./.github/actions/notify_failure
         with: