From 4692d5f5f80101244444b3d95356f5a87591a0da Mon Sep 17 00:00:00 2001 From: Warren James Date: Wed, 20 Nov 2024 15:13:28 -0500 Subject: [PATCH 1/4] run on 22 --- .evergreen/run-tests-ubuntu.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.evergreen/run-tests-ubuntu.sh b/.evergreen/run-tests-ubuntu.sh index 92d0f4ab..910dfa17 100755 --- a/.evergreen/run-tests-ubuntu.sh +++ b/.evergreen/run-tests-ubuntu.sh @@ -123,8 +123,8 @@ else echo -e "SUCCESS: Apache site built and set for Kerberos auth\nActual Output:\n$CURL_OUTPUT" fi -echo "Run: install Node.js 20" -export NODE_LTS_VERSION=20 +echo "Run: install Node.js 22" +export NODE_LTS_VERSION=22 source "${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh" npm test From da5a8d278d1edf09fc478cb4ebca761149ead13c Mon Sep 17 00:00:00 2001 From: Warren James Date: Mon, 25 Nov 2024 12:00:50 -0500 Subject: [PATCH 2/4] add matrix --- .evergreen/config.yml | 80 ++++++++++++++++++++++++++++++++-- .evergreen/run-tests-ubuntu.sh | 5 ++- 2 files changed, 79 insertions(+), 6 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 421a433d..93901b45 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -39,6 +39,7 @@ functions: - '.evergreen/run-tests.sh' env: PROJECT_DIRECTORY: ${PROJECT_DIRECTORY} + NODE_LTS_VERSION: ${NODE_LTS_VERSION} run tests ubuntu: - command: subprocess.exec type: test @@ -47,6 +48,7 @@ functions: working_dir: src env: PROJECT_DIRECTORY: ${PROJECT_DIRECTORY} + NODE_LTS_VERSION: ${NODE_LTS_VERSION} PROJECT: ${project} GYP_DEFINES: ${GYP_DEFINES|} args: @@ -64,6 +66,8 @@ functions: - DRIVERS_TOOLS=/drivers-tools - '--env' - GYP_DEFINES + - '--env' + - NODE_LTS_VERSION=${NODE_LTS_VERSION} - 'ubuntu:22.04' - /bin/bash - /app/.evergreen/run-tests-ubuntu.sh @@ -114,23 +118,91 @@ tasks: - func: run prebuild buildvariants: - - name: ubuntu2204-64 - display_name: 'Ubuntu 22.04 64-bit' + - name: ubuntu2204-64-node-16 + display_name: 'Ubuntu 22.04 64-bit - Node 16' + run_on: ubuntu2204-small + expansions: + has_packages: true + packager_distro: ubuntu2204 + packager_arch: x86_64 + NODE_LTS_VERSION: "16" + tasks: + - run-tests-ubuntu + - run-tests-ubuntu-rtld + - name: ubuntu2204-64-node-18 + display_name: 'Ubuntu 22.04 64-bit - Node 18' + run_on: ubuntu2204-small + expansions: + has_packages: true + packager_distro: ubuntu2204 + packager_arch: x86_64 + NODE_LTS_VERSION: "18" + tasks: + - run-tests-ubuntu + - run-tests-ubuntu-rtld + - name: ubuntu2204-64-node-20 + display_name: 'Ubuntu 22.04 64-bit - Node 20' run_on: ubuntu2204-small expansions: has_packages: true packager_distro: ubuntu2204 packager_arch: x86_64 + NODE_LTS_VERSION: "20" + tasks: + - run-tests-ubuntu + - run-tests-ubuntu-rtld + - name: ubuntu2204-64-node-22 + display_name: 'Ubuntu 22.04 64-bit - Node 22' + run_on: ubuntu2204-small + expansions: + has_packages: true + packager_distro: ubuntu2204 + packager_arch: x86_64 + NODE_LTS_VERSION: "22" + tasks: + - run-tests-ubuntu + - run-tests-ubuntu-rtld + - name: ubuntu2204-arm64-node-16 + display_name: 'Ubuntu 22.04 arm64 - Node 16' + run_on: ubuntu2204-arm64-small + expansions: + has_packages: true + packager_distro: ubuntu2204 + packager_arch: arm64 + NODE_LTS_VERSION: "16" + tasks: + - run-tests-ubuntu + - run-tests-ubuntu-rtld + - name: ubuntu2204-arm64-node-18 + display_name: 'Ubuntu 22.04 arm64 - Node 18' + run_on: ubuntu2204-arm64-small + expansions: + has_packages: true + packager_distro: ubuntu2204 + packager_arch: arm64 + NODE_LTS_VERSION: "18" + tasks: + - run-tests-ubuntu + - run-tests-ubuntu-rtld + - name: ubuntu2204-arm64-node-20 + display_name: 'Ubuntu 22.04 arm64 - Node 20' + run_on: ubuntu2204-arm64-small + expansions: + has_packages: true + packager_distro: ubuntu2204 + packager_arch: arm64 + NODE_LTS_VERSION: "20" tasks: - run-tests-ubuntu - run-tests-ubuntu-rtld - - name: ubuntu2204-arm64 - display_name: 'Ubuntu 22.04 arm64' + - name: ubuntu2204-arm64-node-22 + display_name: 'Ubuntu 22.04 arm64 - Node 22' run_on: ubuntu2204-arm64-small expansions: has_packages: true packager_distro: ubuntu2204 packager_arch: arm64 + NODE_LTS_VERSION: "22" tasks: - run-tests-ubuntu - run-tests-ubuntu-rtld diff --git a/.evergreen/run-tests-ubuntu.sh b/.evergreen/run-tests-ubuntu.sh index 910dfa17..23b0fbab 100755 --- a/.evergreen/run-tests-ubuntu.sh +++ b/.evergreen/run-tests-ubuntu.sh @@ -14,6 +14,8 @@ export KERBEROS_PORT="80" export KERBEROS_HOSTNAME=$HOSTNAME.$KERBEROS_REALM export DEBIAN_FRONTEND=noninteractive +export NODE_LTS_VERSION=$NODE_LTS_VERSION + echo "Installing all the packages required in this test" apt-get update apt-get -y -qq install \ @@ -123,8 +125,7 @@ else echo -e "SUCCESS: Apache site built and set for Kerberos auth\nActual Output:\n$CURL_OUTPUT" fi -echo "Run: install Node.js 22" -export NODE_LTS_VERSION=22 +echo "Run: install Node.js" source "${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh" npm test From 31515096fe54e081a001499bba772bbfc83e4ca4 Mon Sep 17 00:00:00 2001 From: Warren James Date: Mon, 25 Nov 2024 12:06:56 -0500 Subject: [PATCH 3/4] add NPM_VERSION --- .evergreen/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 93901b45..a1fc1deb 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -68,6 +68,8 @@ functions: - GYP_DEFINES - '--env' - NODE_LTS_VERSION=${NODE_LTS_VERSION} + - '--env' + - NPM_VERSION=${NPM_VERSION} - 'ubuntu:22.04' - /bin/bash - /app/.evergreen/run-tests-ubuntu.sh @@ -126,6 +128,7 @@ buildvariants: packager_distro: ubuntu2204 packager_arch: x86_64 NODE_LTS_VERSION: "16" + NPM_VERSION: "9" tasks: - run-tests-ubuntu - run-tests-ubuntu-rtld @@ -170,6 +173,7 @@ buildvariants: packager_distro: ubuntu2204 packager_arch: arm64 NODE_LTS_VERSION: "16" + NPM_VERSION: "9" tasks: - run-tests-ubuntu - run-tests-ubuntu-rtld From 549f68b44889862a5c1b7a1871f842e1bc9a8f78 Mon Sep 17 00:00:00 2001 From: Warren James Date: Mon, 25 Nov 2024 13:38:26 -0500 Subject: [PATCH 4/4] change buildvariants and more clearly print out node version being used --- .evergreen/config.yml | 16 ++++++++-------- .evergreen/install-dependencies.sh | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index a1fc1deb..13a7fd8e 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -120,8 +120,8 @@ tasks: - func: run prebuild buildvariants: - - name: ubuntu2204-64-node-16 - display_name: 'Ubuntu 22.04 64-bit - Node 16' + - name: ubuntu2204-x64-node-16 + display_name: 'Ubuntu 22.04 x64 - Node 16' run_on: ubuntu2204-small expansions: has_packages: true @@ -132,8 +132,8 @@ buildvariants: tasks: - run-tests-ubuntu - run-tests-ubuntu-rtld - - name: ubuntu2204-64-node-18 - display_name: 'Ubuntu 22.04 64-bit - Node 18' + - name: ubuntu2204-x64-node-18 + display_name: 'Ubuntu 22.04 x64 - Node 18' run_on: ubuntu2204-small expansions: has_packages: true @@ -143,8 +143,8 @@ buildvariants: tasks: - run-tests-ubuntu - run-tests-ubuntu-rtld - - name: ubuntu2204-64-node-20 - display_name: 'Ubuntu 22.04 64-bit - Node 20' + - name: ubuntu2204-x64-node-20 + display_name: 'Ubuntu 22.04 x64 - Node 20' run_on: ubuntu2204-small expansions: has_packages: true @@ -154,8 +154,8 @@ buildvariants: tasks: - run-tests-ubuntu - run-tests-ubuntu-rtld - - name: ubuntu2204-64-node-22 - display_name: 'Ubuntu 22.04 64-bit - Node 22' + - name: ubuntu2204-x64-node-22 + display_name: 'Ubuntu 22.04 x64 - Node 22' run_on: ubuntu2204-small expansions: has_packages: true diff --git a/.evergreen/install-dependencies.sh b/.evergreen/install-dependencies.sh index aac2abde..0870c943 100644 --- a/.evergreen/install-dependencies.sh +++ b/.evergreen/install-dependencies.sh @@ -10,6 +10,8 @@ export NODE_LTS_VERSION=${NODE_LTS_VERSION:-14} # a version lower than latest to support EOL Node versions. export NPM_VERSION=${NPM_VERSION:-latest} +echo "Installing Node.js $NODE_LTS_VERSION with npm@$NPM_VERSION" + source $DRIVERS_TOOLS/.evergreen/install-node.sh npm install --build-from-source