Skip to content

Commit 260e20a

Browse files
authored
fix: prevent false positive PR test results (#783)
1 parent ee3f246 commit 260e20a

File tree

2 files changed

+25
-18
lines changed

2 files changed

+25
-18
lines changed

buildspec.yml

+3-18
Original file line numberDiff line numberDiff line change
@@ -17,36 +17,21 @@ phases:
1717
# run unit tests
1818
- AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= AWS_SESSION_TOKEN=
1919
AWS_CONTAINER_CREDENTIALS_RELATIVE_URI= AWS_DEFAULT_REGION=
20-
tox -e py27,py36 -- tests/unit
20+
tox -e py36,py27 -- tests/unit
2121

2222
# run notebook test
2323
- |
2424
if has-matching-changes "src/*.py" "setup.py" "setup.cfg"; then
2525
echo "running notebook test"
26-
python setup.py sdist
27-
aws s3 --region us-west-2 cp ./dist/sagemaker-*.tar.gz s3://sagemaker-python-sdk-pr/sagemaker.tar.gz
28-
aws s3 cp s3://sagemaker-mead-cli/mead-nb-test.tar.gz mead-nb-test.tar.gz
29-
tar -xzf mead-nb-test.tar.gz
30-
git clone --depth 1 https://github.com/awslabs/amazon-sagemaker-examples.git
31-
JAVA_HOME=$(get-java-home)
32-
echo "set JAVA_HOME=$JAVA_HOME"
33-
SAGEMAKER_ROLE_ARN=$(get-sagemaker-role-arn)
34-
echo "set SAGEMAKER_ROLE_ARN=$SAGEMAKER_ROLE_ARN"
35-
./runtime/bin/mead-run-nb-test \
36-
--instance-type ml.c4.8xlarge \
37-
--region us-west-2 \
38-
--lifecycle-config-name install-python-sdk \
39-
--notebook-instance-role-arn $SAGEMAKER_ROLE_ARN \
40-
./amazon-sagemaker-examples/sagemaker-python-sdk/tensorflow_distributed_mnist/tensorflow_batch_transform_mnist.ipynb
26+
./tests/scripts/run-notebook-test.sh
4127
else
4228
echo "skipping notebook test"
4329
fi
4430
4531
# run integration tests
4632
- |
4733
if has-matching-changes "tests/" "src/*.py" "setup.py" "setup.cfg"; then
48-
IGNORE_COVERAGE=- tox -e py36 -- tests/integ -n 24 --boxed --reruns 2
49-
IGNORE_COVERAGE=- tox -e py27 -- tests/integ -n 24 --boxed --reruns 2
34+
IGNORE_COVERAGE=- tox -e py36,py27 -- tests/integ -n 24 --boxed --reruns 2
5035
else
5136
echo "skipping integration tests"
5237
fi

tests/scripts/run-notebook-test.sh

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
#
3+
# Run a test against a SageMaker notebook
4+
# Only runs within the SDK's CI/CD environment
5+
6+
set -euo pipefail
7+
8+
python setup.py sdist
9+
aws s3 --region us-west-2 cp ./dist/sagemaker-*.tar.gz s3://sagemaker-python-sdk-pr/sagemaker.tar.gz
10+
aws s3 cp s3://sagemaker-mead-cli/mead-nb-test.tar.gz mead-nb-test.tar.gz
11+
tar -xzf mead-nb-test.tar.gz
12+
git clone --depth 1 https://github.com/awslabs/amazon-sagemaker-examples.git
13+
JAVA_HOME=$(get-java-home)
14+
echo "set JAVA_HOME=$JAVA_HOME"
15+
SAGEMAKER_ROLE_ARN=$(get-sagemaker-role-arn)
16+
echo "set SAGEMAKER_ROLE_ARN=$SAGEMAKER_ROLE_ARN"
17+
./runtime/bin/mead-run-nb-test \
18+
--instance-type ml.c4.8xlarge \
19+
--region us-west-2 \
20+
--lifecycle-config-name install-python-sdk \
21+
--notebook-instance-role-arn $SAGEMAKER_ROLE_ARN \
22+
./amazon-sagemaker-examples/sagemaker-python-sdk/tensorflow_distributed_mnist/tensorflow_batch_transform_mnist.ipynb

0 commit comments

Comments
 (0)