From 2a594267a5931c2424788b16cc51293fac788bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chris=20Suszy=C5=84ski?= <ksuszyns@redhat.com>
Date: Fri, 8 Mar 2024 14:38:35 +0100
Subject: [PATCH] Switch to Node 20 LTS

---
 olm-catalog/serverless-operator/project.yaml |  2 +-
 openshift/ci-operator/build-image/Dockerfile |  2 +-
 templates/build-image.Dockerfile             |  2 +-
 test/ui/package-lock.json                    | 16 ++++++++--------
 test/ui/package.json                         |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/olm-catalog/serverless-operator/project.yaml b/olm-catalog/serverless-operator/project.yaml
index a82e97cd69..75c0c26020 100644
--- a/olm-catalog/serverless-operator/project.yaml
+++ b/olm-catalog/serverless-operator/project.yaml
@@ -25,7 +25,7 @@ requirements:
         # This value is used for CSV's min version validation.
         minVersion: 1.25.0
     golang: '1.21'
-    nodejs: 16.x
+    nodejs: 20.x
     ocpVersion:
         min: '4.12'
         max: '4.15'
diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile
index dea07b25ed..6b8c59b11c 100644
--- a/openshift/ci-operator/build-image/Dockerfile
+++ b/openshift/ci-operator/build-image/Dockerfile
@@ -13,7 +13,7 @@ RUN rm -rf $GOPATH/.cache
 # Allow runtime users to add entries to /etc/passwd
 RUN chmod g+rw /etc/passwd
 
-RUN yum install -y https://rpm.nodesource.com/pub_16.x/el/7/x86_64/nodesource-release-el7-1.noarch.rpm
+RUN yum install -y https://rpm.nodesource.com/pub_20.x/el/8/x86_64/nodesource-release-el8-1.noarch.rpm
 RUN yum install -y \
   gcc-c++ \
   make \
diff --git a/templates/build-image.Dockerfile b/templates/build-image.Dockerfile
index cae7a06214..9d77489626 100644
--- a/templates/build-image.Dockerfile
+++ b/templates/build-image.Dockerfile
@@ -13,7 +13,7 @@ RUN rm -rf $GOPATH/.cache
 # Allow runtime users to add entries to /etc/passwd
 RUN chmod g+rw /etc/passwd
 
-RUN yum install -y https://rpm.nodesource.com/pub___NODEJS_VERSION__/el/7/x86_64/nodesource-release-el7-1.noarch.rpm
+RUN yum install -y https://rpm.nodesource.com/pub___NODEJS_VERSION__/el/8/x86_64/nodesource-release-el8-1.noarch.rpm
 RUN yum install -y \
   gcc-c++ \
   make \
diff --git a/test/ui/package-lock.json b/test/ui/package-lock.json
index 23decf4984..d3c89f1999 100644
--- a/test/ui/package-lock.json
+++ b/test/ui/package-lock.json
@@ -13,7 +13,7 @@
         "@cypress/skip-test": "^2.6.1",
         "cachedir": "^2.3.0",
         "chalk": "^5.2.0",
-        "cypress": "^13.2.0",
+        "cypress": "^13.6.6",
         "cypress-multi-reporters": "^1.6.3",
         "diff": "^5.0.0",
         "mocha": "^10.2.0",
@@ -89,7 +89,8 @@
       "version": "18.17.18",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.18.tgz",
       "integrity": "sha512-/4QOuy3ZpV7Ya1GTRz5CYSz3DgkKpyUptXuQ5PPce7uuyJAOR7r9FhkmxJfvcNUXyklbC63a+YvB3jxy7s9ngw==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "node_modules/@types/sinonjs__fake-timers": {
       "version": "8.1.1",
@@ -657,21 +658,20 @@
       }
     },
     "node_modules/cypress": {
-      "version": "13.2.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz",
-      "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==",
+      "version": "13.6.6",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.6.6.tgz",
+      "integrity": "sha512-S+2S9S94611hXimH9a3EAYt81QM913ZVA03pUmGDfLTFa5gyp85NJ8dJGSlEAEmyRsYkioS1TtnWtbv/Fzt11A==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
         "@cypress/request": "^3.0.0",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^18.17.5",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
         "blob-util": "^2.0.2",
         "bluebird": "^3.7.2",
-        "buffer": "^5.6.0",
+        "buffer": "^5.7.1",
         "cachedir": "^2.3.0",
         "chalk": "^4.1.0",
         "check-more-types": "^2.24.0",
@@ -689,7 +689,7 @@
         "figures": "^3.2.0",
         "fs-extra": "^9.1.0",
         "getos": "^3.2.1",
-        "is-ci": "^3.0.0",
+        "is-ci": "^3.0.1",
         "is-installed-globally": "~0.4.0",
         "lazy-ass": "^1.6.0",
         "listr2": "^3.8.3",
diff --git a/test/ui/package.json b/test/ui/package.json
index 04e2eb91ec..625a91f8f2 100644
--- a/test/ui/package.json
+++ b/test/ui/package.json
@@ -12,7 +12,7 @@
     "@cypress/skip-test": "^2.6.1",
     "cachedir": "^2.3.0",
     "chalk": "^5.2.0",
-    "cypress": "^13.2.0",
+    "cypress": "^13.6.6",
     "cypress-multi-reporters": "^1.6.3",
     "diff": "^5.0.0",
     "mocha": "^10.2.0",