From 4af19e7aa88f63e98cc967354542071262407ea2 Mon Sep 17 00:00:00 2001
From: Tibor Dancs <tdancs@redhat.com>
Date: Tue, 26 Sep 2023 17:01:10 +0200
Subject: [PATCH] Switched to nvm instead of outdated nodejs install script,
 updated to nodejs v18

Signed-off-by: Tibor Dancs <tdancs@redhat.com>
---
 tests/e2e/build/dockerfiles/Dockerfile    | 13 ++++++++++---
 tests/e2e/build/dockerfiles/entrypoint.sh |  6 +++++-
 tests/e2e/package.json                    |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/tests/e2e/build/dockerfiles/Dockerfile b/tests/e2e/build/dockerfiles/Dockerfile
index 83c2e7065aaf..4f806d59b47f 100644
--- a/tests/e2e/build/dockerfiles/Dockerfile
+++ b/tests/e2e/build/dockerfiles/Dockerfile
@@ -1,4 +1,4 @@
-FROM selenium/standalone-chrome:114.0
+FROM selenium/standalone-chrome:117.0
 
 ENV DISPLAY=':20'
 
@@ -6,8 +6,11 @@ USER root
 
 RUN apt-get update && apt-get install && \
     apt-get install -y ftp x11vnc ffmpeg libvpx6 && \
-    curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash - && \
-    apt-get install -y nodejs && \
+    curl -fsSLo- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash && \
+    export NVM_DIR="$HOME/.nvm" && \
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
+    [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" && \
+    nvm install lts/hydrogen && nvm alias default lts/hydrogen && nvm use default && nvm list && \
     npm install -g typescript && \
     node -v
 
@@ -21,6 +24,10 @@ RUN sed -i "s/nodaemon=true/nodaemon=false/" /etc/supervisord.conf
 COPY package.json package-lock.json /tmp/e2e/
 
 RUN cd /tmp/e2e && \
+    export NVM_DIR="$HOME/.nvm" && \
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
+    [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" && \
+    nvm use default && \
     npm i
 
 COPY . /tmp/e2e
diff --git a/tests/e2e/build/dockerfiles/entrypoint.sh b/tests/e2e/build/dockerfiles/entrypoint.sh
index 117b4506f8b8..d1da6bdaaaf4 100755
--- a/tests/e2e/build/dockerfiles/entrypoint.sh
+++ b/tests/e2e/build/dockerfiles/entrypoint.sh
@@ -1,6 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 EXIT_CODE=0
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+nvm use default
 
 kill_ffmpeg(){
   echo "Killing ffmpeg with PID=$ffmpeg_pid"
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
index e9e72b557aa7..89493b209250 100644
--- a/tests/e2e/package.json
+++ b/tests/e2e/package.json
@@ -31,7 +31,7 @@
     "@typescript-eslint/parser": "^6.1.0",
     "axios": "^0.25.0",
     "chai": "^4.3.4",
-    "chromedriver": "^114.0.2",
+    "chromedriver": "^117.0.0",
     "clone-deep": "^4.0.1",
     "eslint": "^8.45.0",
     "eslint-config-prettier": "^8.10.0",