Skip to content

Commit 6fe3dd1

Browse files
committed
Set machine sizes for gcp and azure
JAVA-5896
1 parent 2fc5f4c commit 6fe3dd1

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.evergreen/.evg.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,6 @@ tasks:
946946
- name: "oidc-auth-test-azure-task"
947947
# Might exceed 1 hour of execution.
948948
exec_timeout_secs: 7200
949-
disable: true # TODO JAVA-5896
950949
commands:
951950
- command: shell.exec
952951
params:
@@ -966,7 +965,6 @@ tasks:
966965
- name: "oidc-auth-test-gcp-task"
967966
# Might exceed 1 hour of execution.
968967
exec_timeout_secs: 7200
969-
disable: true # TODO JAVA-5896
970968
commands:
971969
- command: shell.exec
972970
params:
@@ -2048,6 +2046,7 @@ task_groups:
20482046
export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
20492047
export AZUREKMS_SCOPE=${testazurekms_scope}
20502048
export AZUREKMS_VMNAME_PREFIX=JAVADRIVER
2049+
export AZUREKMS_MACHINESIZE="Standard_DS3_v2"
20512050
$DRIVERS_TOOLS/.evergreen/csfle/azurekms/create-and-setup-vm.sh
20522051
- command: expansions.update
20532052
params:
@@ -2111,6 +2110,7 @@ task_groups:
21112110
include_expansions_in_env: [ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ]
21122111
env:
21132112
AZUREOIDC_VMNAME_PREFIX: "JAVA_DRIVER"
2113+
AZUREKMS_MACHINESIZE: "Standard_DS3_v2"
21142114
args:
21152115
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/azure/create-and-setup-vm.sh
21162116
teardown_task:
@@ -2140,7 +2140,7 @@ task_groups:
21402140
include_expansions_in_env: [ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ]
21412141
env:
21422142
GCPOIDC_VMNAME_PREFIX: "JAVA_DRIVER"
2143-
GCPKMS_MACHINEtype: "e2-medium" # comparable elapsed time to Azure; default was starved, caused timeouts"
2143+
GCPKMS_MACHINETYPE: "e2-standard-4"
21442144
args:
21452145
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/gcp/setup.sh
21462146
teardown_task:
@@ -2269,15 +2269,15 @@ buildvariants:
22692269
- name: "test-gcp-kms-variant"
22702270
display_name: "GCP KMS"
22712271
run_on:
2272-
- debian12-small
2272+
- ubuntu2204-small
22732273
tasks:
22742274
- name: "test-gcp-kms-task-group"
22752275
batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
22762276

22772277
- name: "test-azure-kms-variant"
22782278
display_name: "Azure KMS"
22792279
run_on:
2280-
- debian12-small
2280+
- ubuntu2204-small
22812281
tasks:
22822282
- name: "test-azure-kms-task-group"
22832283
batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README

0 commit comments

Comments
 (0)