Skip to content

Commit 3cbf2b3

Browse files
authored
Specify transfer bucket region in efa tests (#4810)
* Specify transfer bucket region in efa tests * toml * toml * add logs * toml * toml * enable local * Fix volumn size * wip * wip * wip * roll back ebs * toml
1 parent 7295189 commit 3cbf2b3

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

test/dlc_tests/conftest.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,16 +528,18 @@ def delete_s3_artifact_copy():
528528

529529
master_connection.run("rm -rf $HOME/container_tests")
530530
master_connection.run(
531-
f"aws s3 cp --recursive {test_utils.TEST_TRANSFER_S3_BUCKET}/{artifact_folder} $HOME/container_tests"
531+
f"aws s3 cp --recursive {test_utils.TEST_TRANSFER_S3_BUCKET}/{artifact_folder} $HOME/container_tests --region {test_utils.TEST_TRANSFER_S3_BUCKET_REGION}"
532532
)
533+
print(f"Successfully copying {test_utils.TEST_TRANSFER_S3_BUCKET} for master")
533534
master_connection.run(
534535
f"mkdir -p $HOME/container_tests/logs && chmod -R +x $HOME/container_tests/*"
535536
)
536537
for worker_connection in worker_instance_connections:
537538
worker_connection.run("rm -rf $HOME/container_tests")
538539
worker_connection.run(
539-
f"aws s3 cp --recursive {test_utils.TEST_TRANSFER_S3_BUCKET}/{artifact_folder} $HOME/container_tests"
540+
f"aws s3 cp --recursive {test_utils.TEST_TRANSFER_S3_BUCKET}/{artifact_folder} $HOME/container_tests --region {test_utils.TEST_TRANSFER_S3_BUCKET_REGION}"
540541
)
542+
print(f"Successfully copying {test_utils.TEST_TRANSFER_S3_BUCKET} for worker")
541543
worker_connection.run(
542544
f"mkdir -p $HOME/container_tests/logs && chmod -R +x $HOME/container_tests/*"
543545
)

test/dlc_tests/ecs/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def ecs_container_instance(
160160
}
161161
if use_large_storage:
162162
params["BlockDeviceMappings"] = [
163-
{"DeviceName": "/dev/xvda", "Ebs": {"VolumeSize": 90, "VolumeType": "gp2"}}
163+
{"DeviceName": "/dev/xvda", "Ebs": {"VolumeSize": 150, "VolumeType": "gp2"}}
164164
]
165165

166166
reservations = ec2_utils.get_available_reservations(

test/test_utils/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,9 @@ def get_ami_id_ssm(region_name, parameter_path):
218218
# S3 Bucket to use to transfer tests into an EC2 instance
219219
TEST_TRANSFER_S3_BUCKET = f"s3://dlinfra-tests-transfer-bucket-{ACCOUNT_ID}"
220220

221+
# S3 Transfer bucket region
222+
TEST_TRANSFER_S3_BUCKET_REGION = "us-west-2"
223+
221224
# S3 Bucket to use to record benchmark results for further retrieving
222225
BENCHMARK_RESULTS_S3_BUCKET = "s3://dlinfra-dlc-cicd-performance"
223226

0 commit comments

Comments
 (0)