From e841d9201b2b2dd7557ad067cc9141329c652916 Mon Sep 17 00:00:00 2001 From: Malte Poll Date: Fri, 19 Aug 2022 17:23:59 +0200 Subject: [PATCH] Use Azure CVMs in e2e tests --- .github/workflows/e2e-test-azure-weekly.yml | 2 +- .github/workflows/e2e-test-azure.yml | 4 ++-- .github/workflows/e2e-test-manual.yml | 2 +- cli/internal/azure/scaleset_test.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e-test-azure-weekly.yml b/.github/workflows/e2e-test-azure-weekly.yml index e2d529578..30f92f685 100644 --- a/.github/workflows/e2e-test-azure-weekly.yml +++ b/.github/workflows/e2e-test-azure-weekly.yml @@ -26,7 +26,7 @@ jobs: controlNodesCount: "1" autoscale: "false" cloudProvider: "azure" - machineType: "Standard_D4a_v4" + machineType: "Standard_DC4as_v5" azure_credentials: ${{ secrets.AZURE_E2E_CREDENTIALS }} sonobuoyTestSuiteCmd: '--plugin e2e --plugin-env e2e.E2E_FOCUS="\[Conformance\]" --plugin-env e2e.E2E_SKIP="for service with type clusterIP|HostPort validates that there is no conflict between pods with same hostPort but different hostIP and protocol" --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-plugin.yaml --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-master-plugin.yaml' kubernetesVersion: ${{ matrix.version }} diff --git a/.github/workflows/e2e-test-azure.yml b/.github/workflows/e2e-test-azure.yml index fc108d535..aa329e2a3 100644 --- a/.github/workflows/e2e-test-azure.yml +++ b/.github/workflows/e2e-test-azure.yml @@ -21,7 +21,7 @@ jobs: controlNodesCount: "1" autoscale: "false" cloudProvider: "azure" - machineType: "Standard_D4a_v4" + machineType: "Standard_DC4as_v5" azure_credentials: ${{ secrets.AZURE_E2E_CREDENTIALS }} # TODO: Remove E2E_SKIP once AB#2174 is resolved sonobuoyTestSuiteCmd: '--plugin e2e --plugin-env e2e.E2E_FOCUS="\[Conformance\]" --plugin-env e2e.E2E_SKIP="for service with type clusterIP|HostPort validates that there is no conflict between pods with same hostPort but different hostIP and protocol" --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-plugin.yaml --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-master-plugin.yaml' @@ -53,7 +53,7 @@ jobs: controlNodesCount: "1" autoscale: "false" cloudProvider: "azure" - machineType: "Standard_D4a_v4" + machineType: "Standard_DC4as_v5" azure_credentials: ${{ secrets.AZURE_E2E_CREDENTIALS }} sonobuoyTestSuiteCmd: "--mode quick" kubernetesVersion: ${{ matrix.version }} diff --git a/.github/workflows/e2e-test-manual.yml b/.github/workflows/e2e-test-manual.yml index 0beffa2cb..7902b11cb 100644 --- a/.github/workflows/e2e-test-manual.yml +++ b/.github/workflows/e2e-test-manual.yml @@ -29,7 +29,7 @@ on: type: choice options: - "n2d-standard-2" # GCP - - "Standard_D4a_v4" # Azure + - "Standard_DC4as_v5" # Azure default: "n2d-standard-2" required: true sonobuoyTestSuiteCmd: diff --git a/cli/internal/azure/scaleset_test.go b/cli/internal/azure/scaleset_test.go index 24df8e1b5..38c0c829b 100644 --- a/cli/internal/azure/scaleset_test.go +++ b/cli/internal/azure/scaleset_test.go @@ -15,7 +15,7 @@ func TestFirewallPermissions(t *testing.T) { Name: "name", NamePrefix: "constellation-", Location: "UK South", - InstanceType: "Standard_D2s_v3", + InstanceType: "Standard_DC2as_v5", Count: 3, Username: "constellation", SubnetID: "subnet-id",