From 9279c8931206b99160b6aa9322b899b84885d8c4 Mon Sep 17 00:00:00 2001 From: Amarin Phaosawasdi Date: Mon, 15 Aug 2022 10:20:44 -0700 Subject: [PATCH 1/2] test: system test node 14, 16, and 18 --- system-test/integration_test.go | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/system-test/integration_test.go b/system-test/integration_test.go index 303e7c22..3fea0ed7 100644 --- a/system-test/integration_test.go +++ b/system-test/integration_test.go @@ -265,12 +265,12 @@ func TestAgentIntegration(t *testing.T) { InstanceConfig: proftest.InstanceConfig{ ProjectID: projectID, Zone: zone, - Name: fmt.Sprintf("profiler-test-node12-%s", runID), + Name: fmt.Sprintf("profiler-test-node14-%s", runID), MachineType: "n1-standard-1", }, - name: fmt.Sprintf("profiler-test-node12-%s-gce", runID), + name: fmt.Sprintf("profiler-test-node14-%s-gce", runID), wantProfiles: wantProfiles, - nodeVersion: "12", + nodeVersion: "14", timeout: gceTestTimeout, benchDuration: gceBenchDuration, }, @@ -278,12 +278,25 @@ func TestAgentIntegration(t *testing.T) { InstanceConfig: proftest.InstanceConfig{ ProjectID: projectID, Zone: zone, - Name: fmt.Sprintf("profiler-test-node14-%s", runID), + Name: fmt.Sprintf("profiler-test-node16-%s", runID), MachineType: "n1-standard-1", }, - name: fmt.Sprintf("profiler-test-node14-%s-gce", runID), + name: fmt.Sprintf("profiler-test-node16-%s-gce", runID), wantProfiles: wantProfiles, - nodeVersion: "14", + nodeVersion: "16", + timeout: gceTestTimeout, + benchDuration: gceBenchDuration, + }, + { + InstanceConfig: proftest.InstanceConfig{ + ProjectID: projectID, + Zone: zone, + Name: fmt.Sprintf("profiler-test-node18-%s", runID), + MachineType: "n1-standard-1", + }, + name: fmt.Sprintf("profiler-test-node18-%s-gce", runID), + wantProfiles: wantProfiles, + nodeVersion: "18", timeout: gceTestTimeout, benchDuration: gceBenchDuration, }, @@ -295,14 +308,14 @@ func TestAgentIntegration(t *testing.T) { InstanceConfig: proftest.InstanceConfig{ ProjectID: projectID, Zone: zone, - Name: fmt.Sprintf("profiler-backoff-test-node12-%s", runID), + Name: fmt.Sprintf("profiler-backoff-test-node14-%s", runID), // Running many copies of the benchmark requires more // memory than is available on an n1-standard-1. Use a // machine type with more memory for backoff test. MachineType: "n1-highmem-2", }, - name: fmt.Sprintf("profiler-backoff-test-node12-%s", runID), + name: fmt.Sprintf("profiler-backoff-test-node14-%s", runID), backoffTest: true, nodeVersion: "12", timeout: backoffTestTimeout, From c01f2131bf5ac0c6cd91688a592650de859329af Mon Sep 17 00:00:00 2001 From: Amarin Phaosawasdi Date: Mon, 15 Aug 2022 17:14:44 -0700 Subject: [PATCH 2/2] test: system test node 14 and 16 --- system-test/integration_test.go | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/system-test/integration_test.go b/system-test/integration_test.go index 3fea0ed7..7478d5e0 100644 --- a/system-test/integration_test.go +++ b/system-test/integration_test.go @@ -287,19 +287,6 @@ func TestAgentIntegration(t *testing.T) { timeout: gceTestTimeout, benchDuration: gceBenchDuration, }, - { - InstanceConfig: proftest.InstanceConfig{ - ProjectID: projectID, - Zone: zone, - Name: fmt.Sprintf("profiler-test-node18-%s", runID), - MachineType: "n1-standard-1", - }, - name: fmt.Sprintf("profiler-test-node18-%s-gce", runID), - wantProfiles: wantProfiles, - nodeVersion: "18", - timeout: gceTestTimeout, - benchDuration: gceBenchDuration, - }, } if *runBackoffTest { @@ -317,7 +304,7 @@ func TestAgentIntegration(t *testing.T) { }, name: fmt.Sprintf("profiler-backoff-test-node14-%s", runID), backoffTest: true, - nodeVersion: "12", + nodeVersion: "14", timeout: backoffTestTimeout, benchDuration: backoffBenchDuration, })