Skip to content

infra: use ECR-hosted image for ubuntu:16.04 #1987

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 5 commits into from
Nov 16, 2020
Merged

infra: use ECR-hosted image for ubuntu:16.04 #1987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cee900a
fix: use ECR-hosted image for ubuntu:16.04
ajaykarpur Nov 10, 2020
b8f87b6
Merge branch 'master' into fix-docker-pull
ajaykarpur Nov 10, 2020
248c564
Merge branch 'master' into fix-docker-pull
chuyang-deng Nov 13, 2020
773d0f7
change image region to us-east-2
ajaykarpur Nov 16, 2020
f59942b
update base_image region
ajaykarpur Nov 16, 2020
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: 1 addition & 1 deletion tests/data/multimodel/container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM 142577830533.dkr.ecr.us-east-2.amazonaws.com/ubuntu:16.04

# Set a docker label to advertise multi-model support on the container
LABEL com.amazonaws.sagemaker.capabilities.multi-models=true
Expand Down
38 changes: 34 additions & 4 deletions tests/integ/test_multidatamodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import pytest
from botocore.exceptions import ClientError

import tests

from sagemaker import utils
from sagemaker.amazon.randomcutforest import RandomCutForest
from sagemaker.deserializers import StringDeserializer
Expand All @@ -46,18 +48,26 @@ def container_image(sagemaker_session):
algorithm_name = unique_name_from_base("sagemaker-multimodel-integ-test")
ecr_image = _ecr_image_uri(sagemaker_session, algorithm_name)

# Build and tag docker image locally
ecr_client = sagemaker_session.boto_session.client("ecr")
username, password = _ecr_login(ecr_client)

docker_client = docker.from_env()

# Base image pull
base_image = "142577830533.dkr.ecr.us-east-2.amazonaws.com/ubuntu:16.04"
docker_client.images.pull(base_image, auth_config={"username": username, "password": password})

# Build and tag docker image locally
image, build_log = docker_client.images.build(
path=os.path.join(DATA_DIR, "multimodel", "container"), tag=algorithm_name, rm=True
path=os.path.join(DATA_DIR, "multimodel", "container"),
tag=algorithm_name,
rm=True,
)
image.tag(ecr_image, tag="latest")

# Create AWS ECR and push the local docker image to it
ecr_client = sagemaker_session.boto_session.client("ecr")
_create_repository(ecr_client, algorithm_name)

username, password = _ecr_login(ecr_client)
# Retry docker image push
for _ in retries(3, "Upload docker image to ECR repo", seconds_to_sleep=10):
try:
Expand Down Expand Up @@ -124,6 +134,10 @@ def _ecr_login(ecr_client):
return username, password


@pytest.mark.skipif(
tests.integ.test_region() != "us-east-2",
reason="Pulling the base image is currently limited to us-east-2.",
)
def test_multi_data_model_deploy_pretrained_models(
container_image, sagemaker_session, cpu_instance_type
):
Expand Down Expand Up @@ -184,6 +198,10 @@ def test_multi_data_model_deploy_pretrained_models(


@pytest.mark.local_mode
@pytest.mark.skipif(
tests.integ.test_region() != "us-east-2",
reason="Pulling the base image is currently limited to us-east-2.",
)
def test_multi_data_model_deploy_pretrained_models_local_mode(container_image, sagemaker_session):
timestamp = sagemaker_timestamp()
endpoint_name = "test-multimodel-endpoint-{}".format(timestamp)
Expand Down Expand Up @@ -244,6 +262,10 @@ def test_multi_data_model_deploy_pretrained_models_local_mode(container_image, s
assert "Could not find endpoint" in str(exception.value)


@pytest.mark.skipif(
tests.integ.test_region() != "us-east-2",
reason="Pulling the base image is currently limited to us-east-2.",
)
def test_multi_data_model_deploy_trained_model_from_framework_estimator(
container_image,
sagemaker_session,
Expand Down Expand Up @@ -358,6 +380,10 @@ def _mxnet_training_job(
return mx.create_model(image_uri=container_image)


@pytest.mark.skipif(
tests.integ.test_region() != "us-east-2",
reason="Pulling the base image is currently limited to us-east-2.",
)
def test_multi_data_model_deploy_train_model_from_amazon_first_party_estimator(
container_image, sagemaker_session, cpu_instance_type
):
Expand Down Expand Up @@ -455,6 +481,10 @@ def __rcf_training_job(
return rcf_model


@pytest.mark.skipif(
tests.integ.test_region() != "us-east-2",
reason="Pulling the base image is currently limited to us-east-2.",
)
def test_multi_data_model_deploy_pretrained_models_update_endpoint(
container_image, sagemaker_session, cpu_instance_type, alternative_cpu_instance_type
):
Expand Down