Skip to content

Commit

Permalink
update node version used for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
atoulme committed Jan 10, 2025
1 parent fcab6fc commit 5a76e94
Show file tree
Hide file tree
Showing 38 changed files with 39 additions and 39 deletions.
4 changes: 2 additions & 2 deletions deployments/ansible/molecule/shared/install_nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

- name: "download and extract nodejs"
unarchive:
src: https://nodejs.org/download/release/v16.20.2/node-v16.20.2-linux-x64.tar.gz
src: https://nodejs.org/download/release/v18.20.5/node-v18.20.5-linux-x64.tar.gz
dest: /usr/local
remote_src: yes
register: result
Expand All @@ -31,7 +31,7 @@

- name: "create symlinks in /usr/bin"
file:
src: "/usr/local/node-v16.20.2-linux-x64/bin/{{ item }}"
src: "/usr/local/node-v18.20.5-linux-x64/bin/{{ item }}"
dest: "/usr/bin/{{ item }}"
state: link
mode: '755'
Expand Down
2 changes: 1 addition & 1 deletion deployments/chef/kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ suites:
attributes:
nodejs: &nodejs_options
install_method: binary
version: 16.20.2
version: 18.20.5
binary:
append_env_path: false # required for idempotence
checksum: c9193e6c414891694759febe846f4f023bf48410a6924a8b1520c46565859665
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN wget https://apt.puppetlabs.com/puppet${PUPPET_RELEASE}-release-bullseye.deb
apt-get update && \
apt-get install -y puppet-agent

RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \
RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz && \
mkdir -p /opt/ && \
tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \
mv /opt/node* /opt/node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN wget https://apt.puppetlabs.com/puppet${PUPPET_RELEASE}-release-buster.deb &
apt-get update && \
apt-get install -y puppet-agent

RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \
RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz && \
mkdir -p /opt/ && \
tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \
mv /opt/node* /opt/node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN wget https://apt.puppetlabs.com/puppet${PUPPET_RELEASE}-release-stretch.deb
apt-get update && \
apt-get install -y puppet-agent

RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \
RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz && \
mkdir -p /opt/ && \
tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \
mv /opt/node* /opt/node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN wget https://apt.puppetlabs.com/puppet${PUPPET_RELEASE}-release-bionic.deb &
apt-get update && \
apt-get install -y puppet-agent

RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \
RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz && \
mkdir -p /opt/ && \
tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \
mv /opt/node* /opt/node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN wget https://apt.puppetlabs.com/puppet${PUPPET_RELEASE}-release-focal.deb &&
apt-get update && \
apt-get install -y puppet-agent

RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \
RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz && \
mkdir -p /opt/ && \
tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \
mv /opt/node* /opt/node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN wget https://apt.puppetlabs.com/puppet${PUPPET_RELEASE}-release-jammy.deb &&
apt-get update && \
apt-get install -y puppet-agent

RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \
RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz && \
mkdir -p /opt/ && \
tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \
mv /opt/node* /opt/node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN wget https://apt.puppetlabs.com/puppet${PUPPET_RELEASE}-release-xenial.deb &
apt-get update && \
apt-get install -y puppet-agent

RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \
RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz && \
mkdir -p /opt/ && \
tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \
mv /opt/node* /opt/node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG PUPPET_RELEASE="6"
RUN rpm -Uvh https://yum.puppet.com/puppet${PUPPET_RELEASE}-release-el-7.noarch.rpm && \
yum install -y puppet-agent

RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \
RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz && \
mkdir -p /opt/ && \
tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \
mv /opt/node* /opt/node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG PUPPET_RELEASE="6"
RUN rpm -Uvh https://yum.puppet.com/puppet${PUPPET_RELEASE}-release-el-9.noarch.rpm && \
yum install -y puppet-agent

RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \
RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz && \
mkdir -p /opt/ && \
tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \
mv /opt/node* /opt/node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ARG PUPPET_RELEASE="6"
RUN rpm -Uvh https://yum.puppet.com/puppet${PUPPET_RELEASE}-release-el-8.noarch.rpm && \
dnf install -y puppet-agent

RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \
RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz && \
mkdir -p /opt/ && \
tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \
mv /opt/node* /opt/node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ARG PUPPET_RELEASE="6"
RUN rpm -Uvh https://yum.puppet.com/puppet${PUPPET_RELEASE}-release-el-9.noarch.rpm && \
dnf install -y puppet-agent

RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \
RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz && \
mkdir -p /opt/ && \
tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \
mv /opt/node* /opt/node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN rpm -Uvh https://yum.puppet.com/puppet${PUPPET_RELEASE}-release-sles-12.noar
zypper --gpg-auto-import-keys -n refresh && \
zypper install -y puppet-agent

RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \
RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz && \
mkdir -p /opt/ && \
tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \
mv /opt/node* /opt/node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN rpm -Uvh https://yum.puppet.com/puppet${PUPPET_RELEASE}-release-sles-15.noar
zypper --gpg-auto-import-keys -n refresh && \
zypper install -y puppet-agent procps

RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \
RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz && \
mkdir -p /opt/ && \
tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \
mv /opt/node* /opt/node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG PUPPET_RELEASE="6"
RUN rpm -Uvh https://yum.puppet.com/puppet${PUPPET_RELEASE}-release-el-7.noarch.rpm && \
yum install -y puppet-agent

RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \
RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz && \
mkdir -p /opt/ && \
tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \
mv /opt/node* /opt/node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG PUPPET_RELEASE="6"
RUN rpm -Uvh https://yum.puppet.com/puppet${PUPPET_RELEASE}-release-el-8.noarch.rpm && \
dnf install -y puppet-agent

RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \
RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz && \
mkdir -p /opt/ && \
tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \
mv /opt/node* /opt/node
Expand Down
2 changes: 1 addition & 1 deletion packaging/tests/deployments/salt/images/Dockerfile.deb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM ${DISTRO_IMAGE}
ARG DISTRO_IMAGE
ENV DEBIAN_FRONTEND=noninteractive
ENV SALT_VERSION=latest
ENV NODE_VERSION=16.20.2
ENV NODE_VERSION=18.20.5

# repo update for debian:stretch
RUN if [ ${DISTRO_IMAGE} = "debian:stretch" ]; then \
Expand Down
2 changes: 1 addition & 1 deletion packaging/tests/deployments/salt/images/Dockerfile.rpm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG DISTRO_IMAGE
ARG PKG_MGR=dnf
ENV DEBIAN_FRONTEND=noninteractive
ENV SALT_VERSION=latest
ENV NODE_VERSION=16.20.2
ENV NODE_VERSION=18.20.5
ENV container=docker

# config for centos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v14
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v14
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ARG NODE_VERSION=v18
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

Expand Down
2 changes: 1 addition & 1 deletion packaging/tests/instrumentation/setup-express.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ HOME=$NVM_HOME bash -c 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0
NVM_DIR="$NVM_HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"

nvm install --default ${NODE_VERSION:-v16}
nvm install --default ${NODE_VERSION:-v18}

npm config --global set user root

Expand Down

0 comments on commit 5a76e94

Please sign in to comment.