From 77e9db4abf9c9b694d60c8803b436121dfe30ccd Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Wed, 4 Dec 2024 15:25:20 +0400 Subject: [PATCH] test: use two workers in qemu tests by default Fixes #9870 Signed-off-by: Andrey Smirnov --- .github/workflows/ci.yaml | 7 ++----- .github/workflows/integration-cilium-cron.yaml | 5 +---- .github/workflows/integration-conformance-cron.yaml | 3 +-- .github/workflows/integration-extensions-cron.yaml | 3 ++- .kres.yaml | 5 +---- hack/test/e2e-qemu.sh | 2 +- 6 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bc375bc963..d3a3f06423 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-28T14:18:12Z by kres 232fe63. +# Generated on 2024-12-04T12:34:25Z by kres 232fe63. name: default concurrency: @@ -1014,7 +1014,6 @@ jobs: env: GITHUB_STEP_NAME: ${{ github.job}}-e2e-cilium IMAGE_REGISTRY: registry.dev.siderolabs.io - QEMU_WORKERS: "2" SHORT_INTEGRATION_TEST: "yes" WITH_CONFIG_PATCH: '@hack/test/patches/cilium-no-kubeproxy.yaml' WITH_CUSTOM_CNI: cilium @@ -1027,7 +1026,6 @@ jobs: CILIUM_INSTALL_TYPE: strict GITHUB_STEP_NAME: ${{ github.job}}-e2e-cilium-strict IMAGE_REGISTRY: registry.dev.siderolabs.io - QEMU_WORKERS: "2" SHORT_INTEGRATION_TEST: "yes" WITH_CONFIG_PATCH: '@hack/test/patches/cilium-kubeproxy.yaml' WITH_CUSTOM_CNI: cilium @@ -1040,7 +1038,6 @@ jobs: CILIUM_INSTALL_TYPE: strict GITHUB_STEP_NAME: ${{ github.job}}-e2e-cilium-strict-kubespan IMAGE_REGISTRY: registry.dev.siderolabs.io - QEMU_WORKERS: "2" SHORT_INTEGRATION_TEST: "yes" WITH_CONFIG_PATCH: '@hack/test/patches/cilium-kubeproxy.yaml' WITH_CUSTOM_CNI: cilium @@ -1228,7 +1225,6 @@ jobs: GITHUB_STEP_NAME: ${{ github.job}}-conformance-qemu IMAGE_REGISTRY: registry.dev.siderolabs.io QEMU_CPUS: "4" - QEMU_WORKERS: "2" TEST_MODE: fast-conformance run: | sudo -E make e2e-qemu @@ -1469,6 +1465,7 @@ jobs: IMAGE_REGISTRY: registry.dev.siderolabs.io QEMU_EXTRA_DISKS: "3" QEMU_MEMORY_WORKERS: "4096" + QEMU_WORKERS: "1" SHORT_INTEGRATION_TEST: "yes" WITH_CONFIG_PATCH_WORKER: '@_out/installer-extensions-patch.yaml:@hack/test/patches/extensions.yaml:@hack/test/patches/dm-raid-module.yaml' run: | diff --git a/.github/workflows/integration-cilium-cron.yaml b/.github/workflows/integration-cilium-cron.yaml index 2d286705b1..2169ca6862 100644 --- a/.github/workflows/integration-cilium-cron.yaml +++ b/.github/workflows/integration-cilium-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-28T13:53:18Z by kres 232fe63. +# Generated on 2024-12-04T11:25:05Z by kres 232fe63. name: integration-cilium-cron concurrency: @@ -82,7 +82,6 @@ jobs: env: GITHUB_STEP_NAME: ${{ github.job}}-e2e-cilium IMAGE_REGISTRY: registry.dev.siderolabs.io - QEMU_WORKERS: "2" SHORT_INTEGRATION_TEST: "yes" WITH_CONFIG_PATCH: '@hack/test/patches/cilium-no-kubeproxy.yaml' WITH_CUSTOM_CNI: cilium @@ -95,7 +94,6 @@ jobs: CILIUM_INSTALL_TYPE: strict GITHUB_STEP_NAME: ${{ github.job}}-e2e-cilium-strict IMAGE_REGISTRY: registry.dev.siderolabs.io - QEMU_WORKERS: "2" SHORT_INTEGRATION_TEST: "yes" WITH_CONFIG_PATCH: '@hack/test/patches/cilium-kubeproxy.yaml' WITH_CUSTOM_CNI: cilium @@ -108,7 +106,6 @@ jobs: CILIUM_INSTALL_TYPE: strict GITHUB_STEP_NAME: ${{ github.job}}-e2e-cilium-strict-kubespan IMAGE_REGISTRY: registry.dev.siderolabs.io - QEMU_WORKERS: "2" SHORT_INTEGRATION_TEST: "yes" WITH_CONFIG_PATCH: '@hack/test/patches/cilium-kubeproxy.yaml' WITH_CUSTOM_CNI: cilium diff --git a/.github/workflows/integration-conformance-cron.yaml b/.github/workflows/integration-conformance-cron.yaml index 9a9d4a4b6f..0f5922eaee 100644 --- a/.github/workflows/integration-conformance-cron.yaml +++ b/.github/workflows/integration-conformance-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-28T13:48:17Z by kres 232fe63. +# Generated on 2024-12-04T11:25:05Z by kres 232fe63. name: integration-conformance-cron concurrency: @@ -83,7 +83,6 @@ jobs: GITHUB_STEP_NAME: ${{ github.job}}-conformance-qemu IMAGE_REGISTRY: registry.dev.siderolabs.io QEMU_CPUS: "4" - QEMU_WORKERS: "2" TEST_MODE: fast-conformance run: | sudo -E make e2e-qemu diff --git a/.github/workflows/integration-extensions-cron.yaml b/.github/workflows/integration-extensions-cron.yaml index 43f3529b2e..15b871f42d 100644 --- a/.github/workflows/integration-extensions-cron.yaml +++ b/.github/workflows/integration-extensions-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-28T13:53:18Z by kres 232fe63. +# Generated on 2024-12-04T12:34:25Z by kres 232fe63. name: integration-extensions-cron concurrency: @@ -113,6 +113,7 @@ jobs: IMAGE_REGISTRY: registry.dev.siderolabs.io QEMU_EXTRA_DISKS: "3" QEMU_MEMORY_WORKERS: "4096" + QEMU_WORKERS: "1" SHORT_INTEGRATION_TEST: "yes" WITH_CONFIG_PATCH_WORKER: '@_out/installer-extensions-patch.yaml:@hack/test/patches/extensions.yaml:@hack/test/patches/dm-raid-module.yaml' run: | diff --git a/.kres.yaml b/.kres.yaml index 3e82eebbfc..be179ba066 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -385,7 +385,6 @@ spec: withSudo: true environment: GITHUB_STEP_NAME: ${{ github.job}}-conformance-qemu - QEMU_WORKERS: 2 QEMU_CPUS: 4 TEST_MODE: fast-conformance IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -1054,6 +1053,7 @@ spec: withSudo: true environment: GITHUB_STEP_NAME: ${{ github.job}}-e2e-extensions + QEMU_WORKERS: 1 QEMU_MEMORY_WORKERS: 4096 WITH_CONFIG_PATCH_WORKER: "@_out/installer-extensions-patch.yaml:@hack/test/patches/extensions.yaml:@hack/test/patches/dm-raid-module.yaml" QEMU_EXTRA_DISKS: 3 @@ -1113,7 +1113,6 @@ spec: WITH_SKIP_K8S_NODE_READINESS_CHECK: yes WITH_CUSTOM_CNI: cilium WITH_FIREWALL: accept - QEMU_WORKERS: 2 WITH_CONFIG_PATCH: "@hack/test/patches/cilium-no-kubeproxy.yaml" IMAGE_REGISTRY: registry.dev.siderolabs.io - name: e2e-cilium-strict @@ -1125,7 +1124,6 @@ spec: WITH_SKIP_K8S_NODE_READINESS_CHECK: yes WITH_CUSTOM_CNI: cilium WITH_FIREWALL: accept - QEMU_WORKERS: 2 CILIUM_INSTALL_TYPE: strict WITH_CONFIG_PATCH: "@hack/test/patches/cilium-kubeproxy.yaml" IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -1139,7 +1137,6 @@ spec: WITH_CUSTOM_CNI: cilium WITH_FIREWALL: accept WITH_KUBESPAN: true - QEMU_WORKERS: 2 CILIUM_INSTALL_TYPE: strict WITH_CONFIG_PATCH: "@hack/test/patches/cilium-kubeproxy.yaml" IMAGE_REGISTRY: registry.dev.siderolabs.io diff --git a/hack/test/e2e-qemu.sh b/hack/test/e2e-qemu.sh index bed3f2987d..51e6c0aef4 100755 --- a/hack/test/e2e-qemu.sh +++ b/hack/test/e2e-qemu.sh @@ -209,7 +209,7 @@ function create_cluster { --name="${CLUSTER_NAME}" \ --kubernetes-version="${KUBERNETES_VERSION}" \ --controlplanes=3 \ - --workers="${QEMU_WORKERS:-1}" \ + --workers="${QEMU_WORKERS:-2}" \ --disk=15360 \ --extra-disks="${QEMU_EXTRA_DISKS:-0}" \ --extra-disks-size="${QEMU_EXTRA_DISKS_SIZE:-5120}" \