Skip to content

fix: skip efs tests in non us-west-2 regions #1003

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 1 commit into from
Aug 27, 2019
Merged

fix: skip efs tests in non us-west-2 regions #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions tests/integ/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@
NO_LDA_REGIONS = ["eu-west-3", "eu-north-1", "sa-east-1", "ap-east-1"]
NO_MARKET_PLACE_REGIONS = ["eu-west-3", "eu-north-1", "sa-east-1", "ap-east-1"]

EFS_TEST_ENABLED_REGION = ["us-west-2"]

logging.getLogger("boto3").setLevel(logging.INFO)
logging.getLogger("botocore").setLevel(logging.INFO)

Expand Down
21 changes: 18 additions & 3 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 @@ -14,14 +14,15 @@

import pytest

import tests.integ
from sagemaker import KMeans
from sagemaker.amazon.amazon_estimator import FileSystemRecordSet
from sagemaker.parameter import IntegerParameter, CategoricalParameter
from sagemaker.tuner import HyperparameterTuner
from sagemaker.utils import unique_name_from_base
from tests.integ import TRAINING_DEFAULT_TIMEOUT_MINUTES, TUNING_DEFAULT_TIMEOUT_MINUTES
from tests.integ.s3_utils import assert_s3_files_exist
from tests.integ.file_system_input_utils import set_up_efs_fsx, tear_down
from tests.integ.s3_utils import assert_s3_files_exist
from tests.integ.timeout import timeout

TRAIN_INSTANCE_TYPE = "ml.c4.xlarge"
Expand All @@ -45,7 +46,10 @@ def efs_fsx_setup(sagemaker_session):
tear_down(sagemaker_session, fs_resources)


@pytest.mark.canary_quick
@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):
with timeout(minutes=TRAINING_DEFAULT_TIMEOUT_MINUTES):
subnets = [efs_fsx_setup.subnet_id]
Expand Down Expand Up @@ -76,7 +80,10 @@ def test_kmeans_efs(efs_fsx_setup, sagemaker_session):
assert_s3_files_exist(sagemaker_session, model_path, ["model.tar.gz"])


@pytest.mark.canary_quick
@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):
with timeout(minutes=TRAINING_DEFAULT_TIMEOUT_MINUTES):
subnets = [efs_fsx_setup.subnet_id]
Expand Down Expand Up @@ -107,6 +114,10 @@ def test_kmeans_fsx(efs_fsx_setup, sagemaker_session):
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):
subnets = [efs_fsx_setup.subnet_id]
security_group_ids = efs_fsx_setup.security_group_ids
Expand Down Expand Up @@ -163,6 +174,10 @@ def test_tuning_kmeans_efs(efs_fsx_setup, sagemaker_session):
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):
subnets = [efs_fsx_setup.subnet_id]
security_group_ids = efs_fsx_setup.security_group_ids
Expand Down
21 changes: 18 additions & 3 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 @@ -17,14 +17,15 @@

import pytest

import tests.integ
from sagemaker.inputs import FileSystemInput
from sagemaker.parameter import IntegerParameter
from sagemaker.tensorflow import TensorFlow
from sagemaker.tuner import HyperparameterTuner
from sagemaker.utils import unique_name_from_base
from tests.integ import TRAINING_DEFAULT_TIMEOUT_MINUTES, TUNING_DEFAULT_TIMEOUT_MINUTES
from tests.integ.s3_utils import assert_s3_files_exist
from tests.integ.file_system_input_utils import tear_down, set_up_efs_fsx
from tests.integ.s3_utils import assert_s3_files_exist
from tests.integ.timeout import timeout

RESOURCE_PATH = os.path.join(os.path.dirname(__file__), "..", "data")
Expand All @@ -48,7 +49,10 @@ def efs_fsx_setup(sagemaker_session):
tear_down(sagemaker_session, fs_resources)


@pytest.mark.canary_quick
@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):
role = efs_fsx_setup.role_name
subnets = [efs_fsx_setup.subnet_id]
Expand Down Expand Up @@ -81,7 +85,10 @@ def test_mnist_efs(efs_fsx_setup, sagemaker_session):
)


@pytest.mark.canary_quick
@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):
role = efs_fsx_setup.role_name
subnets = [efs_fsx_setup.subnet_id]
Expand Down Expand Up @@ -114,6 +121,10 @@ def test_mnist_lustre(efs_fsx_setup, sagemaker_session):
)


@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):
role = efs_fsx_setup.role_name
subnets = [efs_fsx_setup.subnet_id]
Expand Down Expand Up @@ -158,6 +169,10 @@ def test_tuning_tf_script_mode_efs(efs_fsx_setup, sagemaker_session):
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):
role = efs_fsx_setup.role_name
subnets = [efs_fsx_setup.subnet_id]
Expand Down