Skip to content

update: disable efs fsx integ tests in non-pdx regions #1018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Sep 4, 2019
Merged

update: disable efs fsx integ tests in non-pdx regions #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
30424a3
fix: clean up resources created by file system set up whenever settin…
caxiaohu Aug 28, 2019
314efa6
fix: change file system resoures to dict and add condition check for …
caxiaohu Aug 29, 2019
3ec7746
Merge branch 'master' into fix-fs-resources-cleanup
knakad Aug 29, 2019
31bb4da
fix: remove initialization of fs_resources and change name
caxiaohu Aug 29, 2019
4daab90
update: remove creating efs exception statement
caxiaohu Aug 29, 2019
feecc95
update: reomve check in name for creating efs and fsx
caxiaohu Aug 29, 2019
8280a89
update: fix create vpc parameters issue
caxiaohu Aug 31, 2019
b140be8
update: skip test_markplace.py
caxiaohu Sep 1, 2019
913434a
update: skip exception failure in tear_down for clean up resources
caxiaohu Sep 2, 2019
24d3405
fix: vpc issue
caxiaohu Sep 2, 2019
4b4e5ad
add vpc tag earlier
caxiaohu Sep 2, 2019
77db93f
update: changed lock_path for efs
caxiaohu Sep 2, 2019
4d3703e
fix: fix vpc reaches limitation issue
caxiaohu Sep 3, 2019
0761e30
update: merge master branch
caxiaohu Sep 3, 2019
1dd04b4
fix: fix canary failure issues and vpc limitation issues
caxiaohu Sep 3, 2019
821c78a
fix: fix canary failure issues
caxiaohu Sep 3, 2019
af32ca5
fix: unskip integ test for efs and fsx
caxiaohu Sep 3, 2019
ff74785
update: disable efs and fsx in regions except PDX
caxiaohu Sep 3, 2019
94a32e8
update: merge to master
caxiaohu Sep 3, 2019
eef469d
Update test_tf_efs_fsx.py
caxiaohu Sep 3, 2019
0fa4437
Update test_kmeans_efs_fsx.py
caxiaohu Sep 3, 2019
1f874ae
Merge branch 'master' into disable-efs-fsx-non-PDX-region
chuyang-deng Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions tests/integ/test_kmeans_efs_fsx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from sagemaker.parameter import IntegerParameter, CategoricalParameter
from sagemaker.tuner import HyperparameterTuner
from sagemaker.utils import unique_name_from_base
import tests
from tests.integ import TRAINING_DEFAULT_TIMEOUT_MINUTES, TUNING_DEFAULT_TIMEOUT_MINUTES
from tests.integ.file_system_input_utils import set_up_efs_fsx, tear_down
from tests.integ.s3_utils import assert_s3_files_exist
Expand Down Expand Up @@ -46,6 +47,10 @@ def efs_fsx_setup(sagemaker_session, ec2_instance_type):
tear_down(sagemaker_session, fs_resources)


@pytest.mark.skipif(
tests.integ.test_region() not in tests.integ.EFS_TEST_ENABLED_REGION,
reason="EFS integration tests need to be fixed before running in all regions.",
)
def test_kmeans_efs(efs_fsx_setup, sagemaker_session, cpu_instance_type):
with timeout(minutes=TRAINING_DEFAULT_TIMEOUT_MINUTES):
role = efs_fsx_setup["role_name"]
Expand Down Expand Up @@ -77,6 +82,10 @@ def test_kmeans_efs(efs_fsx_setup, sagemaker_session, cpu_instance_type):
assert_s3_files_exist(sagemaker_session, model_path, ["model.tar.gz"])


@pytest.mark.skipif(
tests.integ.test_region() not in tests.integ.EFS_TEST_ENABLED_REGION,
reason="EFS integration tests need to be fixed before running in all regions.",
)
def test_kmeans_fsx(efs_fsx_setup, sagemaker_session, cpu_instance_type):
with timeout(minutes=TRAINING_DEFAULT_TIMEOUT_MINUTES):
role = efs_fsx_setup["role_name"]
Expand Down Expand Up @@ -107,6 +116,10 @@ def test_kmeans_fsx(efs_fsx_setup, sagemaker_session, cpu_instance_type):
assert_s3_files_exist(sagemaker_session, model_path, ["model.tar.gz"])


@pytest.mark.skipif(
tests.integ.test_region() not in tests.integ.EFS_TEST_ENABLED_REGION,
reason="EFS integration tests need to be fixed before running in all regions.",
)
def test_tuning_kmeans_efs(efs_fsx_setup, sagemaker_session, cpu_instance_type):
role = efs_fsx_setup["role_name"]
subnets = [efs_fsx_setup["subnet_id"]]
Expand Down Expand Up @@ -163,6 +176,10 @@ def test_tuning_kmeans_efs(efs_fsx_setup, sagemaker_session, cpu_instance_type):
assert best_training_job


@pytest.mark.skipif(
tests.integ.test_region() not in tests.integ.EFS_TEST_ENABLED_REGION,
reason="EFS integration tests need to be fixed before running in all regions.",
)
def test_tuning_kmeans_fsx(efs_fsx_setup, sagemaker_session, cpu_instance_type):
role = efs_fsx_setup["role_name"]
subnets = [efs_fsx_setup["subnet_id"]]
Expand Down
17 changes: 17 additions & 0 deletions tests/integ/test_tf_efs_fsx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from sagemaker.tensorflow import TensorFlow
from sagemaker.tuner import HyperparameterTuner
from sagemaker.utils import unique_name_from_base
import tests
from tests.integ import TRAINING_DEFAULT_TIMEOUT_MINUTES, TUNING_DEFAULT_TIMEOUT_MINUTES
from tests.integ.file_system_input_utils import tear_down, set_up_efs_fsx
from tests.integ.s3_utils import assert_s3_files_exist
Expand Down Expand Up @@ -49,6 +50,10 @@ def efs_fsx_setup(sagemaker_session, ec2_instance_type):
tear_down(sagemaker_session, fs_resources)


@pytest.mark.skipif(
tests.integ.test_region() not in tests.integ.EFS_TEST_ENABLED_REGION,
reason="EFS integration tests need to be fixed before running in all regions.",
)
def test_mnist_efs(efs_fsx_setup, sagemaker_session, cpu_instance_type):
role = efs_fsx_setup["role_name"]
subnets = [efs_fsx_setup["subnet_id"]]
Expand Down Expand Up @@ -81,6 +86,10 @@ def test_mnist_efs(efs_fsx_setup, sagemaker_session, cpu_instance_type):
)


@pytest.mark.skipif(
tests.integ.test_region() not in tests.integ.EFS_TEST_ENABLED_REGION,
reason="EFS integration tests need to be fixed before running in all regions.",
)
def test_mnist_lustre(efs_fsx_setup, sagemaker_session, cpu_instance_type):
role = efs_fsx_setup["role_name"]
subnets = [efs_fsx_setup["subnet_id"]]
Expand Down Expand Up @@ -113,6 +122,10 @@ def test_mnist_lustre(efs_fsx_setup, sagemaker_session, cpu_instance_type):
)


@pytest.mark.skipif(
tests.integ.test_region() not in tests.integ.EFS_TEST_ENABLED_REGION,
reason="EFS integration tests need to be fixed before running in all regions.",
)
def test_tuning_tf_script_mode_efs(efs_fsx_setup, sagemaker_session, cpu_instance_type):
role = efs_fsx_setup["role_name"]
subnets = [efs_fsx_setup["subnet_id"]]
Expand Down Expand Up @@ -157,6 +170,10 @@ def test_tuning_tf_script_mode_efs(efs_fsx_setup, sagemaker_session, cpu_instanc
assert best_training_job


@pytest.mark.skipif(
tests.integ.test_region() not in tests.integ.EFS_TEST_ENABLED_REGION,
reason="EFS integration tests need to be fixed before running in all regions.",
)
def test_tuning_tf_script_mode_lustre(efs_fsx_setup, sagemaker_session, cpu_instance_type):
role = efs_fsx_setup["role_name"]
subnets = [efs_fsx_setup["subnet_id"]]
Expand Down