Skip to content

Commit d27dc3f

Browse files
authored
Merge pull request #80 from zsombor-balogh/distro-update
Update os distro and runtime versions in compatibility tests
2 parents 020fa7a + 0da3a57 commit d27dc3f

18 files changed

+27
-468
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ setup-codebuild-agent:
1717

1818
.PHONY: test-smoke
1919
test-smoke: setup-codebuild-agent
20-
CODEBUILD_IMAGE_TAG=codebuild-agent tests/integration/codebuild-local/test_one.sh tests/integration/codebuild/buildspec.os.alpine.1.yml alpine 3.12 3.8
20+
CODEBUILD_IMAGE_TAG=codebuild-agent tests/integration/codebuild-local/test_one.sh tests/integration/codebuild/buildspec.os.alpine.yml alpine 3.15 3.9
2121

2222
.PHONY: test-integ
2323
test-integ: setup-codebuild-agent

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ You can include this package in your preferred base image to make that base imag
1010

1111
## Requirements
1212
The Python Runtime Interface Client package currently supports Python versions:
13-
- 3.6.x up to and including 3.9.x
13+
- 3.7.x up to and including 3.9.x
1414

1515
## Usage
1616

@@ -58,7 +58,7 @@ Example Dockerfile (to keep the image light we use a multi-stage build):
5858
# Define custom function directory
5959
ARG FUNCTION_DIR="/function"
6060

61-
FROM python:buster as build-image
61+
FROM public.ecr.aws/docker/library/python:buster as build-image
6262

6363
# Include global arg in this stage of the build
6464
ARG FUNCTION_DIR
@@ -82,7 +82,7 @@ RUN pip install \
8282
awslambdaric
8383

8484

85-
FROM python:buster
85+
FROM public.ecr.aws/docker/library/python:buster
8686

8787
# Include global arg in this stage of the build
8888
ARG FUNCTION_DIR

tests/integration/codebuild-local/Dockerfile.agent

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM amazonlinux:2
1+
FROM public.ecr.aws/amazonlinux/amazonlinux:2
22

33
RUN amazon-linux-extras enable docker && \
44
yum clean metadata && \

tests/integration/codebuild/buildspec.os.alpine.1.yml

-111
This file was deleted.

tests/integration/codebuild/buildspec.os.alpine.2.yml

-113
This file was deleted.

tests/integration/codebuild/buildspec.os.alpine.3.yml renamed to tests/integration/codebuild/buildspec.os.alpine.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ env:
44
variables:
55
OS_DISTRIBUTION: alpine
66
PYTHON_LOCATION: "/usr/local/bin/python"
7-
TEST_NAME: "aws-lambda-python-rtc-alpine-3-test"
7+
TEST_NAME: "aws-lambda-python-rtc-alpine-test"
88
batch:
99
build-matrix:
1010
static:
@@ -15,9 +15,10 @@ batch:
1515
env:
1616
variables:
1717
DISTRO_VERSION:
18-
- "3.12"
18+
- "3.13"
19+
- "3.14"
20+
- "3.15"
1921
RUNTIME_VERSION:
20-
- "3.6"
2122
- "3.7"
2223
- "3.8"
2324
- "3.9"

tests/integration/codebuild/buildspec.os.amazonlinux.1.yml

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ batch:
1717
DISTRO_VERSION:
1818
- "1"
1919
RUNTIME_VERSION:
20-
- "3.6"
2120
- "3.7"
2221
- "3.8"
2322
- "3.9"

tests/integration/codebuild/buildspec.os.amazonlinux.2.yml

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ batch:
1717
DISTRO_VERSION:
1818
- "2"
1919
RUNTIME_VERSION:
20-
- "3.6"
2120
- "3.7"
2221
- "3.8"
2322
- "3.9"

0 commit comments

Comments
 (0)