Skip to content

Commit 688d4f2

Browse files
Stefan9283Stefan9283
committed
Fix integ tests
1 parent a762c33 commit 688d4f2

6 files changed

+234
-10
lines changed

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

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 0.2
22

33
env:
44
variables:
5-
OS_DISTRIBUTION: amazonlinux
5+
OS_DISTRIBUTION: amazonlinux2
66
PYTHON_LOCATION: "/usr/local/bin/python3"
77
TEST_NAME: "aws-lambda-python-rtc-amazonlinux-test"
88
batch:
@@ -20,8 +20,6 @@ batch:
2020
- "3.9"
2121
- "3.10"
2222
- "3.11"
23-
- "3.12"
24-
- "3.13"
2523
phases:
2624
pre_build:
2725
commands:
@@ -43,9 +41,6 @@ phases:
4341
- >
4442
cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
4543
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
46-
- >
47-
echo "COPY ${SCRATCH_DIR}/${RIE} /usr/bin/${RIE}" >> \
48-
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
4944
- >
5045
echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' > /etc/docker/daemon.json
5146
service docker restart
@@ -57,6 +52,7 @@ phases:
5752
--build-arg RUNTIME_VERSION="${RUNTIME_VERSION}" \
5853
--build-arg DISTRO_VERSION="${DISTRO_VERSION}" \
5954
--build-arg ARCHITECTURE="${ARCHITECTURE}" \
55+
--build-arg RIE="${RIE}" \
6056
--load
6157
build:
6258
commands:

‎tests/integration/codebuild/buildspec.os.amazonlinux.2023.yml

+103
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
version: 0.2
2+
3+
env:
4+
variables:
5+
OS_DISTRIBUTION: amazonlinux2023
6+
PYTHON_LOCATION: "/usr/local/bin/python3"
7+
TEST_NAME: "aws-lambda-python-rtc-amazonlinux-test"
8+
batch:
9+
build-matrix:
10+
static:
11+
ignore-failure: false
12+
env:
13+
privileged-mode: true
14+
dynamic:
15+
env:
16+
variables:
17+
DISTRO_VERSION:
18+
- "2023"
19+
RUNTIME_VERSION:
20+
- "3.12"
21+
- "3.13"
22+
phases:
23+
pre_build:
24+
commands:
25+
- export IMAGE_TAG="python-${OS_DISTRIBUTION}-${DISTRO_VERSION}:${RUNTIME_VERSION}"
26+
- echo "Extracting and including the Runtime Interface Emulator"
27+
- SCRATCH_DIR=".scratch"
28+
- mkdir "${SCRATCH_DIR}"
29+
- ARCHITECTURE=$(arch)
30+
- >
31+
if [[ "$ARCHITECTURE" == "x86_64" ]]; then
32+
RIE="aws-lambda-rie"
33+
elif [[ "$ARCHITECTURE" == "aarch64" ]]; then
34+
RIE="aws-lambda-rie-arm64"
35+
else
36+
echo "Architecture $ARCHITECTURE is not currently supported."
37+
exit 1
38+
fi
39+
- tar -xvf tests/integration/resources/${RIE}.tar.gz --directory "${SCRATCH_DIR}"
40+
- >
41+
cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
42+
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
43+
- >
44+
echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' > /etc/docker/daemon.json
45+
service docker restart
46+
- echo "Building image ${IMAGE_TAG}"
47+
- >
48+
docker build . \
49+
-f "${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp" \
50+
-t "${IMAGE_TAG}" \
51+
--build-arg RUNTIME_VERSION="${RUNTIME_VERSION}" \
52+
--build-arg DISTRO_VERSION="${DISTRO_VERSION}" \
53+
--build-arg ARCHITECTURE="${ARCHITECTURE}" \
54+
--build-arg RIE="${RIE}" \
55+
--load
56+
build:
57+
commands:
58+
- set -x
59+
- echo "Running Image ${IMAGE_TAG}"
60+
- docker network create "${TEST_NAME}-network"
61+
- >
62+
docker run \
63+
--detach \
64+
--name "${TEST_NAME}-app" \
65+
--network "${TEST_NAME}-network" \
66+
--entrypoint="" \
67+
"${IMAGE_TAG}" \
68+
sh -c "/usr/bin/${RIE} ${PYTHON_LOCATION} -m awslambdaric app.handler"
69+
- sleep 2
70+
- >
71+
docker run \
72+
--name "${TEST_NAME}-tester" \
73+
--env "TARGET=${TEST_NAME}-app" \
74+
--network "${TEST_NAME}-network" \
75+
--entrypoint="" \
76+
"${IMAGE_TAG}" \
77+
sh -c 'curl -X POST "http://${TARGET}:8080/2015-03-31/functions/function/invocations" -d "{}" --max-time 10'
78+
- actual="$(docker logs --tail 1 "${TEST_NAME}-tester" | xargs)"
79+
- expected='success'
80+
- |
81+
echo "Response: ${actual}"
82+
if [[ "$actual" != "$expected" ]]; then
83+
echo "fail! runtime: $RUNTIME - expected output $expected - got $actual"
84+
exit -1
85+
fi
86+
finally:
87+
- |
88+
echo "---------Container Logs: ${TEST_NAME}-app----------"
89+
echo
90+
docker logs "${TEST_NAME}-app" || true
91+
echo
92+
echo "---------------------------------------------------"
93+
echo "--------Container Logs: ${TEST_NAME}-tester--------"
94+
echo
95+
docker logs "${TEST_NAME}-tester" || true
96+
echo
97+
echo "---------------------------------------------------"
98+
- echo "Cleaning up..."
99+
- docker stop "${TEST_NAME}-app" || true
100+
- docker rm --force "${TEST_NAME}-app" || true
101+
- docker stop "${TEST_NAME}-tester" || true
102+
- docker rm --force "${TEST_NAME}-tester" || true
103+
- docker network rm "${TEST_NAME}-network" || true

‎tests/integration/docker/Dockerfile.echo.alpine

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RUN mkdir -p ${RIC_BUILD_DIR}
3131
# Copy function code and Runtime Interface Client .tgz
3232
WORKDIR ${RIC_BUILD_DIR}
3333
COPY . .
34+
RUN pip3 install setuptools
3435
RUN make init build test && \
3536
mv ./dist/awslambdaric-*.tar.gz ./dist/awslambdaric-test.tar.gz
3637

‎tests/integration/docker/Dockerfile.echo.amazonlinux ‎tests/integration/docker/Dockerfile.echo.amazonlinux2

-4
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ RUN mkdir -p ${RIC_BUILD_DIR}
8181
WORKDIR ${RIC_BUILD_DIR}
8282
COPY . .
8383

84-
# distutils no longer available in python3.12 and later
85-
# https://docs.python.org/3/whatsnew/3.12.html
86-
# https://peps.python.org/pep-0632/
87-
RUN if [ $(cut -d '.' -f 2 <<< ${RUNTIME_VERSION}) -ge 12 ]; then pip3 install setuptools; fi
8884
RUN make init build test && \
8985
mv ./dist/awslambdaric-*.tar.gz ./dist/awslambdaric-test.tar.gz
9086

‎tests/integration/docker/Dockerfile.echo.amazonlinux2023

+127
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
ARG DISTRO_VERSION
2+
# Stage 1 - bundle base image + runtime interface client
3+
# Grab a fresh copy of the image and install Python
4+
FROM public.ecr.aws/amazonlinux/amazonlinux:${DISTRO_VERSION} AS python-amazonlinux-builder
5+
6+
ARG RUNTIME_VERSION
7+
8+
# Install apt dependencies
9+
RUN dnf install -y \
10+
gcc \
11+
gcc-c++ \
12+
tar \
13+
gzip \
14+
make \
15+
autoconf \
16+
automake \
17+
freetype-devel \
18+
yum-utils \
19+
findutils \
20+
wget \
21+
openssl \
22+
openssl-devel \
23+
bzip2-devel \
24+
libffi-devel \
25+
sqlite-devel
26+
27+
RUN RUNTIME_LATEST_VERSION=${RUNTIME_VERSION}.$(curl -s https://www.python.org/ftp/python/ | \
28+
grep -oE "href=\"$(echo ${RUNTIME_VERSION} | sed "s/\\./\\\./g")\.[0-9]+" | \
29+
cut -d. -f3 | \
30+
sort -rn | \
31+
while read -r patch; do \
32+
$(wget -c https://www.python.org/ftp/python/${RUNTIME_VERSION}.$patch/Python-${RUNTIME_VERSION}.$patch.tgz -O Python-${RUNTIME_VERSION}.$patch.tgz); \
33+
[ $? -eq 0 ] && echo $patch && break; \
34+
done) \
35+
&& tar -xzf Python-${RUNTIME_LATEST_VERSION}.tgz \
36+
&& cd Python-${RUNTIME_LATEST_VERSION} \
37+
&& ./configure --prefix=/usr/local --enable-shared \
38+
&& make \
39+
&& make install \
40+
&& ln -s /usr/local/bin/python${RUNTIME_VERSION} /usr/local/bin/python${RUNTIME_LATEST_VERSION}
41+
42+
# Stage 2 - clean python build dependencies
43+
FROM public.ecr.aws/amazonlinux/amazonlinux:${DISTRO_VERSION} AS python-amazonlinux
44+
RUN dnf install -y \
45+
libffi-devel
46+
47+
# Copy the compiled python to /usr/local
48+
COPY --from=python-amazonlinux-builder /usr/local /usr/local
49+
ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
50+
51+
# Stage 3 - build function and dependencies
52+
FROM python-amazonlinux-builder AS build-image
53+
ARG RUNTIME_VERSION
54+
ARG ARCHITECTURE
55+
56+
# Install aws-lambda-cpp build dependencies
57+
RUN dnf install -y \
58+
tar \
59+
gzip \
60+
make \
61+
autoconf \
62+
automake \
63+
libtool \
64+
libcurl-devel \
65+
gcc-c++ \
66+
wget \
67+
sqlite-devel
68+
69+
# Install a modern CMake
70+
RUN wget --quiet -O cmake-install https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0-linux-${ARCHITECTURE}.sh && \
71+
sh cmake-install --skip-license --prefix=/usr --exclude-subdirectory;
72+
73+
ENV PATH=/usr/local/bin:$PATH
74+
ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
75+
76+
77+
# Include global args in this stage of the build
78+
ARG RIC_BUILD_DIR="/home/build/"
79+
# Create function directory
80+
RUN mkdir -p ${RIC_BUILD_DIR}
81+
# Copy function code and Runtime Interface Client .tgz
82+
WORKDIR ${RIC_BUILD_DIR}
83+
COPY . .
84+
85+
# distutils no longer available in python3.12 and later
86+
# https://docs.python.org/3/whatsnew/3.12.html
87+
# https://peps.python.org/pep-0632/
88+
RUN pip3 install setuptools
89+
RUN make init build
90+
91+
RUN mv ./dist/awslambdaric-*.tar.gz ./dist/awslambdaric-test.tar.gz
92+
RUN python${RUNTIME_VERSION} -m pip install \
93+
./dist/awslambdaric-test.tar.gz \
94+
--target ${RIC_BUILD_DIR}
95+
96+
RUN make test
97+
98+
# Include global args in this stage of the build
99+
ARG FUNCTION_DIR="/home/app/"
100+
# Create function directory
101+
RUN mkdir -p ${FUNCTION_DIR}
102+
# Copy function code
103+
COPY tests/integration/test-handlers/echo/* ${FUNCTION_DIR}
104+
# Copy Runtime Interface Client .tgz
105+
RUN cp ./dist/awslambdaric-test.tar.gz ${FUNCTION_DIR}/awslambdaric-test.tar.gz
106+
107+
# Install the function's dependencies
108+
WORKDIR ${FUNCTION_DIR}
109+
RUN python${RUNTIME_VERSION} -m pip install \
110+
awslambdaric-test.tar.gz \
111+
--target ${FUNCTION_DIR} && \
112+
rm awslambdaric-test.tar.gz
113+
114+
115+
# Stage 4 - final runtime interface client image
116+
# Grab a fresh copy of the Python image
117+
FROM python-amazonlinux
118+
RUN dnf install -y brotli
119+
# Include global arg in this stage of the build
120+
ARG FUNCTION_DIR="/home/app/"
121+
# Set working directory to function root directory
122+
WORKDIR ${FUNCTION_DIR}
123+
# Copy in the built dependencies
124+
COPY --from=build-image ${FUNCTION_DIR} ${FUNCTION_DIR}
125+
COPY .scratch/${RIE} /usr/bin/${RIE}
126+
ENTRYPOINT [ "/usr/local/bin/python3", "-m", "awslambdaric" ]
127+
CMD [ "app.handler" ]

‎tests/integration/docker/Dockerfile.echo.debian

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN mkdir -p ${RIC_BUILD_DIR}
1919
# Copy function code and Runtime Interface Client .tgz
2020
WORKDIR ${RIC_BUILD_DIR}
2121
COPY . .
22+
RUN pip3 install setuptools
2223
RUN make init build test && \
2324
mv ./dist/awslambdaric-*.tar.gz ./dist/awslambdaric-test.tar.gz
2425

0 commit comments

Comments
 (0)