From 5a76e9489f66abfd69c09ced8ee747dfe8db94d4 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 9 Jan 2025 22:30:20 -0800 Subject: [PATCH] update node version used for testing --- deployments/ansible/molecule/shared/install_nodejs.yml | 4 ++-- deployments/chef/kitchen.yml | 2 +- .../deployments/puppet/images/deb/Dockerfile.debian-bullseye | 2 +- .../deployments/puppet/images/deb/Dockerfile.debian-buster | 2 +- .../deployments/puppet/images/deb/Dockerfile.debian-stretch | 2 +- .../deployments/puppet/images/deb/Dockerfile.ubuntu-bionic | 2 +- .../deployments/puppet/images/deb/Dockerfile.ubuntu-focal | 2 +- .../deployments/puppet/images/deb/Dockerfile.ubuntu-jammy | 2 +- .../deployments/puppet/images/deb/Dockerfile.ubuntu-xenial | 2 +- .../deployments/puppet/images/rpm/Dockerfile.amazonlinux-2 | 2 +- .../deployments/puppet/images/rpm/Dockerfile.amazonlinux-2023 | 2 +- .../tests/deployments/puppet/images/rpm/Dockerfile.centos-8 | 2 +- .../tests/deployments/puppet/images/rpm/Dockerfile.centos-9 | 2 +- .../deployments/puppet/images/rpm/Dockerfile.opensuse-12 | 2 +- .../deployments/puppet/images/rpm/Dockerfile.opensuse-15 | 2 +- .../deployments/puppet/images/rpm/Dockerfile.oraclelinux-7 | 2 +- .../deployments/puppet/images/rpm/Dockerfile.oraclelinux-8 | 2 +- packaging/tests/deployments/salt/images/Dockerfile.deb | 2 +- packaging/tests/deployments/salt/images/Dockerfile.rpm | 2 +- .../instrumentation/images/deb/Dockerfile.debian-bookworm | 2 +- .../instrumentation/images/deb/Dockerfile.debian-bullseye | 2 +- .../tests/instrumentation/images/deb/Dockerfile.debian-buster | 2 +- .../instrumentation/images/deb/Dockerfile.debian-stretch | 2 +- .../tests/instrumentation/images/deb/Dockerfile.ubuntu-bionic | 2 +- .../tests/instrumentation/images/deb/Dockerfile.ubuntu-focal | 2 +- .../tests/instrumentation/images/deb/Dockerfile.ubuntu-jammy | 2 +- .../tests/instrumentation/images/deb/Dockerfile.ubuntu-noble | 2 +- .../tests/instrumentation/images/deb/Dockerfile.ubuntu-xenial | 2 +- .../tests/instrumentation/images/rpm/Dockerfile.amazonlinux-2 | 2 +- .../instrumentation/images/rpm/Dockerfile.amazonlinux-2023 | 2 +- .../tests/instrumentation/images/rpm/Dockerfile.centos-8 | 2 +- .../tests/instrumentation/images/rpm/Dockerfile.centos-9 | 2 +- .../tests/instrumentation/images/rpm/Dockerfile.opensuse-12 | 2 +- .../tests/instrumentation/images/rpm/Dockerfile.opensuse-15 | 2 +- .../tests/instrumentation/images/rpm/Dockerfile.oraclelinux-7 | 2 +- .../tests/instrumentation/images/rpm/Dockerfile.oraclelinux-8 | 2 +- .../tests/instrumentation/images/rpm/Dockerfile.oraclelinux-9 | 2 +- packaging/tests/instrumentation/setup-express.sh | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) diff --git a/deployments/ansible/molecule/shared/install_nodejs.yml b/deployments/ansible/molecule/shared/install_nodejs.yml index 28aec3fc5e..9a9738daec 100644 --- a/deployments/ansible/molecule/shared/install_nodejs.yml +++ b/deployments/ansible/molecule/shared/install_nodejs.yml @@ -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 @@ -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' diff --git a/deployments/chef/kitchen.yml b/deployments/chef/kitchen.yml index 8e1124c292..33906d776f 100644 --- a/deployments/chef/kitchen.yml +++ b/deployments/chef/kitchen.yml @@ -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 diff --git a/packaging/tests/deployments/puppet/images/deb/Dockerfile.debian-bullseye b/packaging/tests/deployments/puppet/images/deb/Dockerfile.debian-bullseye index b9daedcd87..76f6f5451a 100644 --- a/packaging/tests/deployments/puppet/images/deb/Dockerfile.debian-bullseye +++ b/packaging/tests/deployments/puppet/images/deb/Dockerfile.debian-bullseye @@ -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 diff --git a/packaging/tests/deployments/puppet/images/deb/Dockerfile.debian-buster b/packaging/tests/deployments/puppet/images/deb/Dockerfile.debian-buster index 6e37fa76c8..51485fa022 100644 --- a/packaging/tests/deployments/puppet/images/deb/Dockerfile.debian-buster +++ b/packaging/tests/deployments/puppet/images/deb/Dockerfile.debian-buster @@ -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 diff --git a/packaging/tests/deployments/puppet/images/deb/Dockerfile.debian-stretch b/packaging/tests/deployments/puppet/images/deb/Dockerfile.debian-stretch index b27eeec288..84c6a0266b 100644 --- a/packaging/tests/deployments/puppet/images/deb/Dockerfile.debian-stretch +++ b/packaging/tests/deployments/puppet/images/deb/Dockerfile.debian-stretch @@ -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 diff --git a/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-bionic b/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-bionic index f22a245ce2..1c01075c18 100644 --- a/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-bionic +++ b/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-bionic @@ -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 diff --git a/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-focal b/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-focal index 44cee1e9d3..16cc5e6fda 100644 --- a/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-focal +++ b/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-focal @@ -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 diff --git a/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-jammy b/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-jammy index c748c947ce..bfe021e3a1 100644 --- a/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-jammy +++ b/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-jammy @@ -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 diff --git a/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-xenial b/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-xenial index f844ea9030..3c6fca43d4 100644 --- a/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-xenial +++ b/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-xenial @@ -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 diff --git a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.amazonlinux-2 b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.amazonlinux-2 index 2c3891f533..4d96f06f48 100644 --- a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.amazonlinux-2 +++ b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.amazonlinux-2 @@ -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 diff --git a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.amazonlinux-2023 b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.amazonlinux-2023 index ec826ce3cd..aada525b59 100644 --- a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.amazonlinux-2023 +++ b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.amazonlinux-2023 @@ -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 diff --git a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.centos-8 b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.centos-8 index f949dbc99c..408a267306 100644 --- a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.centos-8 +++ b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.centos-8 @@ -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 diff --git a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.centos-9 b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.centos-9 index 02d093a89e..28a5254200 100644 --- a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.centos-9 +++ b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.centos-9 @@ -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 diff --git a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.opensuse-12 b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.opensuse-12 index 819c3b240e..2acb294963 100644 --- a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.opensuse-12 +++ b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.opensuse-12 @@ -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 diff --git a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.opensuse-15 b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.opensuse-15 index f878980a8a..be808b679a 100644 --- a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.opensuse-15 +++ b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.opensuse-15 @@ -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 diff --git a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.oraclelinux-7 b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.oraclelinux-7 index bcdff663fe..78d95d70ba 100644 --- a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.oraclelinux-7 +++ b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.oraclelinux-7 @@ -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 diff --git a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.oraclelinux-8 b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.oraclelinux-8 index 8a93f948e3..98bbf03fad 100644 --- a/packaging/tests/deployments/puppet/images/rpm/Dockerfile.oraclelinux-8 +++ b/packaging/tests/deployments/puppet/images/rpm/Dockerfile.oraclelinux-8 @@ -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 diff --git a/packaging/tests/deployments/salt/images/Dockerfile.deb b/packaging/tests/deployments/salt/images/Dockerfile.deb index e6ff8c58a5..0f605b681e 100644 --- a/packaging/tests/deployments/salt/images/Dockerfile.deb +++ b/packaging/tests/deployments/salt/images/Dockerfile.deb @@ -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 \ diff --git a/packaging/tests/deployments/salt/images/Dockerfile.rpm b/packaging/tests/deployments/salt/images/Dockerfile.rpm index 7f13bc0f95..68baaa572f 100644 --- a/packaging/tests/deployments/salt/images/Dockerfile.rpm +++ b/packaging/tests/deployments/salt/images/Dockerfile.rpm @@ -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 diff --git a/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bookworm b/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bookworm index 9e3a9b609b..d19f859b64 100644 --- a/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bookworm +++ b/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bookworm @@ -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 diff --git a/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bullseye b/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bullseye index 26717239f6..b4c3887ddc 100644 --- a/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bullseye +++ b/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bullseye @@ -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 diff --git a/packaging/tests/instrumentation/images/deb/Dockerfile.debian-buster b/packaging/tests/instrumentation/images/deb/Dockerfile.debian-buster index 305408d15b..07868716a0 100644 --- a/packaging/tests/instrumentation/images/deb/Dockerfile.debian-buster +++ b/packaging/tests/instrumentation/images/deb/Dockerfile.debian-buster @@ -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 diff --git a/packaging/tests/instrumentation/images/deb/Dockerfile.debian-stretch b/packaging/tests/instrumentation/images/deb/Dockerfile.debian-stretch index 0c6c048814..6b3ed8cc00 100644 --- a/packaging/tests/instrumentation/images/deb/Dockerfile.debian-stretch +++ b/packaging/tests/instrumentation/images/deb/Dockerfile.debian-stretch @@ -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 diff --git a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-bionic b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-bionic index 920bffed7c..afe43f57c9 100644 --- a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-bionic +++ b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-bionic @@ -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 diff --git a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-focal b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-focal index 3d73a5b364..9b61c55234 100644 --- a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-focal +++ b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-focal @@ -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 diff --git a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-jammy b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-jammy index 7782d5e009..6319e2cd5e 100644 --- a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-jammy +++ b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-jammy @@ -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 diff --git a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-noble b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-noble index 04bc038dbb..b7b8b0dd98 100644 --- a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-noble +++ b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-noble @@ -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 diff --git a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-xenial b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-xenial index d7eb2208a0..29155f0cf7 100644 --- a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-xenial +++ b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-xenial @@ -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 diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.amazonlinux-2 b/packaging/tests/instrumentation/images/rpm/Dockerfile.amazonlinux-2 index 21beddf548..0bed426fec 100644 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.amazonlinux-2 +++ b/packaging/tests/instrumentation/images/rpm/Dockerfile.amazonlinux-2 @@ -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 diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.amazonlinux-2023 b/packaging/tests/instrumentation/images/rpm/Dockerfile.amazonlinux-2023 index 8033fa6f12..399aacfa39 100644 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.amazonlinux-2023 +++ b/packaging/tests/instrumentation/images/rpm/Dockerfile.amazonlinux-2023 @@ -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 diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-8 b/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-8 index 2e16d42739..a9460113b6 100644 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-8 +++ b/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-8 @@ -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 diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-9 b/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-9 index b81ba14e7f..4a80496eaa 100644 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-9 +++ b/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-9 @@ -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 diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-12 b/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-12 index 8aa81dfe0b..dd0899b82d 100644 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-12 +++ b/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-12 @@ -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 diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-15 b/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-15 index d995973669..773049eedd 100644 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-15 +++ b/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-15 @@ -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 diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-7 b/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-7 index 1766e85bb0..ba153bda42 100644 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-7 +++ b/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-7 @@ -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 diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-8 b/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-8 index 88274f3c01..294aabd988 100644 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-8 +++ b/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-8 @@ -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 diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-9 b/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-9 index aad7947829..7a5fc5ba96 100644 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-9 +++ b/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-9 @@ -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 diff --git a/packaging/tests/instrumentation/setup-express.sh b/packaging/tests/instrumentation/setup-express.sh index 77d7040118..620da0a49c 100644 --- a/packaging/tests/instrumentation/setup-express.sh +++ b/packaging/tests/instrumentation/setup-express.sh @@ -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