Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f283247

Browse files
committedFeb 14, 2024
Remove Node14 from integ tests matrix since it is deprecated
1 parent b6b3656 commit f283247

13 files changed

+4
-149
lines changed
 

‎README.md

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

1111
## Requirements
1212
The NodeJS Runtime Interface Client package currently supports NodeJS versions:
13-
- 14.x
1413
- 16.x
1514
- 18.x
1615
- 20.x

‎test/integration/codebuild/buildspec.os.alpine.1.yml

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ batch:
1616
DISTRO_VERSION:
1717
- "3.16"
1818
RUNTIME_VERSION:
19-
- "14"
2019
- "16"
2120
- "18"
2221
phases:

‎test/integration/codebuild/buildspec.os.alpine.2.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ batch:
1616
env:
1717
variables:
1818
DISTRO_VERSION:
19-
- "3.16"
19+
- "3.18"
2020
RUNTIME_VERSION:
21-
- "14"
21+
- "20"
2222
phases:
2323
pre_build:
2424
commands:

‎test/integration/codebuild/buildspec.os.alpine.4.yml

-102
This file was deleted.

‎test/integration/codebuild/buildspec.os.centos.yml

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ batch:
1717
- "stream8"
1818
- "stream9"
1919
RUNTIME_VERSION:
20-
- "14"
2120
- "16"
2221
- "18"
2322
- "20"

‎test/integration/codebuild/buildspec.os.debian.1.yml

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ batch:
1717
- "buster"
1818
- "bullseye"
1919
RUNTIME_VERSION:
20-
- "14"
2120
- "16"
2221
- "18"
2322
- "20"

‎test/integration/codebuild/buildspec.os.ubuntu.1.yml

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ batch:
1818
- "20.04"
1919
- "22.04"
2020
RUNTIME_VERSION:
21-
- "14"
2221
- "16"
2322
phases:
2423
pre_build:

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

-5
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ RUN mkdir -p ${FUNCTION_DIR}
4040
WORKDIR ${FUNCTION_DIR}/deps/aws-lambda-ric
4141
COPY . .
4242

43-
# Node14 uses npm@6.14.18 by default which will downgrade permissions, if it's root,
44-
# before running any build scripts: https://github.com/npm/npm/issues/3497
45-
# Starting from npm@7.0.0, when npm is run as root,
46-
# scripts are always run with the effective uid and gid of the working directory owner.
47-
RUN if [[ $(node -v | cut -c 1-3) == "v14" ]] ; then npm install -g npm@7 ; fi
4843
RUN make build && \
4944
npm run test:unit
5045

‎test/integration/docker/Dockerfile.echo.amazonlinux

+2-15
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,8 @@ ARG DISTRO_VERSION
1212
# Install Py3 required to build Node16+
1313
RUN if [[ "${DISTRO_VERSION}" == "2" ]] ; then amazon-linux-extras install python3.8 && update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1 ; fi
1414
# Install NodeJS
15-
RUN if [[ "${RUNTIME_VERSION}" == "14" ]]; then \
16-
yum install -y tar gzip xz && \
17-
AARCH="$([[ "$(arch)" == "x86_64" ]] && echo "x64" || echo "arm64")" && \
18-
NODE_URL="https://nodejs.org/download/release/v14.21.3/node-v14.21.3-linux-$AARCH.tar.xz" && \
19-
curl -fL "$NODE_URL" | tar -C /usr --strip-components 1 -xJf - && \
20-
yum clean all -q && rm -rf /var/cache/yum ; \
21-
else \
22-
yum install https://rpm.nodesource.com/pub_${RUNTIME_VERSION}.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm -y && \
23-
yum install nodejs -y --setopt=nodesource-nodejs.module_hotfixes=1s ; \
24-
fi
15+
RUN yum install https://rpm.nodesource.com/pub_${RUNTIME_VERSION}.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm -y && \
16+
yum install nodejs -y --setopt=nodesource-nodejs.module_hotfixes=1s;
2517

2618
# Stage 2 - build function and dependencies
2719
FROM node-amazonlinux AS build-image
@@ -50,11 +42,6 @@ RUN mkdir -p ${FUNCTION_DIR}
5042
WORKDIR ${FUNCTION_DIR}/deps/aws-lambda-ric
5143
COPY . .
5244

53-
# Node14 uses npm@6.14.18 by default which will downgrade permissions, if it's root,
54-
# before running any build scripts: https://github.com/npm/npm/issues/3497
55-
# Starting from npm@7.0.0, when npm is run as root,
56-
# scripts are always run with the effective uid and gid of the working directory owner.
57-
RUN if [[ $(node -v | cut -c 1-3) == "v14" ]] ; then npm install -g npm@7 ; fi
5845
RUN make build && \
5946
npm run test:unit
6047

‎test/integration/docker/Dockerfile.echo.centos

-5
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ RUN mkdir -p ${FUNCTION_DIR}
4040
WORKDIR ${FUNCTION_DIR}/deps/aws-lambda-ric
4141
COPY . .
4242

43-
# Node14 uses npm@6.14.18 by default which will downgrade permissions, if it's root,
44-
# before running any build scripts: https://github.com/npm/npm/issues/3497
45-
# Starting from npm@7.0.0, when npm is run as root,
46-
# scripts are always run with the effective uid and gid of the working directory owner.
47-
RUN if [[ $(node -v | cut -c 1-3) == "v14" ]] ; then npm install -g npm@7 ; fi
4843
RUN make build && \
4944
npm run test:unit
5045

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

-5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ RUN mkdir -p ${FUNCTION_DIR}
2222
WORKDIR ${FUNCTION_DIR}/deps/aws-lambda-ric
2323
COPY . .
2424

25-
# Node14 uses npm@6.14.18 by default which will downgrade permissions, if it's root,
26-
# before running any build scripts: https://github.com/npm/npm/issues/3497
27-
# Starting from npm@7.0.0, when npm is run as root,
28-
# scripts are always run with the effective uid and gid of the working directory owner.
29-
RUN if [ $(node -v | cut -c 1-3) = "v14" ] ; then npm install -g npm@7 ; fi
3025
RUN make build && \
3126
npm run test:unit
3227

‎test/integration/docker/Dockerfile.echo.ubuntu

-5
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ RUN mkdir -p ${FUNCTION_DIR}
4848
WORKDIR ${FUNCTION_DIR}/deps/aws-lambda-ric
4949
COPY . .
5050

51-
# Node14 uses npm@6.14.18 by default which will downgrade permissions, if it's root,
52-
# before running any build scripts: https://github.com/npm/npm/issues/3497
53-
# Starting from npm@7.0.0, when npm is run as root,
54-
# scripts are always run with the effective uid and gid of the working directory owner.
55-
RUN if [ $(node -v | cut -c 1-3) = "v14" ] ; then npm install -g npm@7 ; fi
5651
RUN make build && \
5752
npm run test:unit
5853

‎test/integration/docker/Dockerfile.programmatic.alpine

-5
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ RUN mkdir -p ${FUNCTION_DIR}
4040
WORKDIR ${FUNCTION_DIR}/deps/aws-lambda-ric
4141
COPY . .
4242

43-
# Node14 uses npm@6.14.18 by default which will downgrade permissions, if it's root,
44-
# before running any build scripts: https://github.com/npm/npm/issues/3497
45-
# Starting from npm@7.0.0, when npm is run as root,
46-
# scripts are always run with the effective uid and gid of the working directory owner.
47-
RUN if [[ $(node -v | cut -c 1-3) == "v14" ]] ; then npm install -g npm@7 ; fi
4843
RUN make build && \
4944
npm run test:unit
5045

0 commit comments

Comments
 (0)
Please sign in to comment.