Add edge to nodejs agents + change dependencies repo (#1063)

opendevstack · Oct 1, 2024 · 419ecbf · 419ecbf
1 parent 14c2fd9
commit 419ecbf
Show file tree

Hide file tree

Showing 18 changed files with 91 additions and 57 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,8 @@
 - Fix ETL Python QS: AWS Test codepipeline Status Managment and update cryptography dependency([#1056](https://github.com/opendevstack/ods-quickstarters/pull/1052))
 - Fix for npm based jenkins agents to support private nexus repositories ([#1059](https://github.com/opendevstack/ods-quickstarters/issues/1059))
 - Introduce Rust Quickstarter dependency graph linting (cargo-deny) and upgrade maintenance ([#1061](https://github.com/opendevstack/ods-quickstarters/issues/1061))
+- Add microsoft-edge to nodejs agents for using with cypress ([#1063](https://github.com/opendevstack/ods-quickstarters/pull/1063))
+- Replaced centos8 repository for AlmaLinux 8 due to deprecation ([#1063](https://github.com/opendevstack/ods-quickstarters/pull/1063))
 
 ### Added
 

diff --git a/common/jenkins-agents/nodejs16/docker/Dockerfile.ubi8 b/common/jenkins-agents/nodejs16/docker/Dockerfile.ubi8
@@ -38,10 +38,12 @@ RUN curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERS
 # Install Cypress dependencies
 # https://docs.cypress.io/guides/getting-started/installing-cypress.html#System-requirements
 COPY yum.repos.d/google-chrome.repo /etc/yum.repos.d/google-chrome.repo
-COPY yum.repos.d/centos8.repo /etc/yum.repos.d/centos8.repo
+COPY yum.repos.d/almalinux.repo /etc/yum.repos.d/almalinux.repo
+COPY yum.repos.d/microsoft-edge.repo /etc/yum.repos.d/microsoft-edge.repo
 RUN yum repolist \
     && yum install -y xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel GConf2 nss libXScrnSaver alsa-lib \
     && yum install -y --enablerepo google-chrome google-chrome-stable \
+    && yum install -y --enablerepo edge microsoft-edge-stable \
     && yum clean all -y
 
 RUN npm config set registry=$nexusUrl/repository/npmjs/ && \

diff --git a/common/jenkins-agents/nodejs16/docker/yum.repos.d/almalinux.repo b/common/jenkins-agents/nodejs16/docker/yum.repos.d/almalinux.repo
@@ -0,0 +1,13 @@
+[almalinux-baseos]
+name=AlmaLinux-8-BaseOS
+baseurl=https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/
+enabled=1
+gpgcheck=1
+gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
+
+[almalinux-appstream]
+name=AlmaLinux-8-AppStream
+baseurl=https://repo.almalinux.org/almalinux/8/AppStream/x86_64/os/
+enabled=1
+gpgcheck=1
+gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
diff --git a/common/jenkins-agents/nodejs16/docker/yum.repos.d/centos8.repo b/common/jenkins-agents/nodejs16/docker/yum.repos.d/centos8.repo
diff --git a/common/jenkins-agents/nodejs16/docker/yum.repos.d/microsoft-edge.repo b/common/jenkins-agents/nodejs16/docker/yum.repos.d/microsoft-edge.repo
@@ -0,0 +1,6 @@
+[edge]
+name=Microsoft Edge Browser
+baseurl=https://packages.microsoft.com/yumrepos/edge
+enabled=0
+gpgcheck=1
+gpgkey=https://packages.microsoft.com/keys/microsoft.asc
diff --git a/common/jenkins-agents/nodejs18/docker/Dockerfile.ubi8 b/common/jenkins-agents/nodejs18/docker/Dockerfile.ubi8
@@ -38,10 +38,12 @@ RUN curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERS
 # Install Cypress dependencies
 # https://docs.cypress.io/guides/getting-started/installing-cypress.html#System-requirements
 COPY yum.repos.d/google-chrome.repo /etc/yum.repos.d/google-chrome.repo
-COPY yum.repos.d/centos8.repo /etc/yum.repos.d/centos8.repo
+COPY yum.repos.d/almalinux.repo /etc/yum.repos.d/almalinux.repo
+COPY yum.repos.d/microsoft-edge.repo /etc/yum.repos.d/microsoft-edge.repo
 RUN yum repolist \
     && yum install -y xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel GConf2 nss libXScrnSaver alsa-lib \
     && yum install -y --enablerepo google-chrome google-chrome-stable \
+    && yum install -y --enablerepo edge microsoft-edge-stable \
     && yum clean all -y
 
 RUN npm config set registry=$nexusUrl/repository/npmjs/ && \

diff --git a/common/jenkins-agents/nodejs18/docker/yum.repos.d/almalinux.repo b/common/jenkins-agents/nodejs18/docker/yum.repos.d/almalinux.repo
@@ -0,0 +1,13 @@
+[almalinux-baseos]
+name=AlmaLinux-8-BaseOS
+baseurl=https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/
+enabled=1
+gpgcheck=1
+gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
+
+[almalinux-appstream]
+name=AlmaLinux-8-AppStream
+baseurl=https://repo.almalinux.org/almalinux/8/AppStream/x86_64/os/
+enabled=1
+gpgcheck=1
+gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
diff --git a/common/jenkins-agents/nodejs18/docker/yum.repos.d/centos8.repo b/common/jenkins-agents/nodejs18/docker/yum.repos.d/centos8.repo
diff --git a/common/jenkins-agents/nodejs18/docker/yum.repos.d/microsoft-edge.repo b/common/jenkins-agents/nodejs18/docker/yum.repos.d/microsoft-edge.repo
@@ -0,0 +1,6 @@
+[edge]
+name=Microsoft Edge Browser
+baseurl=https://packages.microsoft.com/yumrepos/edge
+enabled=0
+gpgcheck=1
+gpgkey=https://packages.microsoft.com/keys/microsoft.asc
diff --git a/common/jenkins-agents/nodejs20/docker/Dockerfile.ubi8 b/common/jenkins-agents/nodejs20/docker/Dockerfile.ubi8
@@ -38,10 +38,12 @@ RUN curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERS
 # Install Cypress dependencies
 # https://docs.cypress.io/guides/getting-started/installing-cypress.html#System-requirements
 COPY yum.repos.d/google-chrome.repo /etc/yum.repos.d/google-chrome.repo
-COPY yum.repos.d/centos8.repo /etc/yum.repos.d/centos8.repo
+COPY yum.repos.d/almalinux.repo /etc/yum.repos.d/almalinux.repo
+COPY yum.repos.d/microsoft-edge.repo /etc/yum.repos.d/microsoft-edge.repo
 RUN yum repolist \
     && yum install -y xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel GConf2 nss libXScrnSaver alsa-lib \
     && yum install -y --enablerepo google-chrome google-chrome-stable \
+    && yum install -y --enablerepo edge microsoft-edge-stable \
     && yum clean all -y
 
 RUN npm config set registry=$nexusUrl/repository/npmjs/ && \

diff --git a/common/jenkins-agents/nodejs20/docker/yum.repos.d/almalinux.repo b/common/jenkins-agents/nodejs20/docker/yum.repos.d/almalinux.repo
@@ -0,0 +1,13 @@
+[almalinux-baseos]
+name=AlmaLinux-8-BaseOS
+baseurl=https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/
+enabled=1
+gpgcheck=1
+gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
+
+[almalinux-appstream]
+name=AlmaLinux-8-AppStream
+baseurl=https://repo.almalinux.org/almalinux/8/AppStream/x86_64/os/
+enabled=1
+gpgcheck=1
+gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
diff --git a/common/jenkins-agents/nodejs20/docker/yum.repos.d/centos8.repo b/common/jenkins-agents/nodejs20/docker/yum.repos.d/centos8.repo
diff --git a/common/jenkins-agents/nodejs20/docker/yum.repos.d/microsoft-edge.repo b/common/jenkins-agents/nodejs20/docker/yum.repos.d/microsoft-edge.repo
@@ -0,0 +1,6 @@
+[edge]
+name=Microsoft Edge Browser
+baseurl=https://packages.microsoft.com/yumrepos/edge
+enabled=0
+gpgcheck=1
+gpgkey=https://packages.microsoft.com/keys/microsoft.asc
diff --git a/common/jenkins-agents/nodejs22/docker/Dockerfile.ubi8 b/common/jenkins-agents/nodejs22/docker/Dockerfile.ubi8
@@ -38,10 +38,12 @@ RUN curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERS
 # Install Cypress dependencies
 # https://docs.cypress.io/guides/getting-started/installing-cypress.html#System-requirements
 COPY yum.repos.d/google-chrome.repo /etc/yum.repos.d/google-chrome.repo
-COPY yum.repos.d/centos8.repo /etc/yum.repos.d/centos8.repo
+COPY yum.repos.d/almalinux.repo /etc/yum.repos.d/almalinux.repo
+COPY yum.repos.d/microsoft-edge.repo /etc/yum.repos.d/microsoft-edge.repo
 RUN yum repolist \
     && yum install -y xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel GConf2 nss libXScrnSaver alsa-lib \
     && yum install -y --enablerepo google-chrome google-chrome-stable \
+    && yum install -y --enablerepo edge microsoft-edge-stable \
     && yum clean all -y
 
 RUN npm config set registry=$nexusUrl/repository/npmjs/ && \

diff --git a/common/jenkins-agents/nodejs22/docker/yum.repos.d/almalinux.repo b/common/jenkins-agents/nodejs22/docker/yum.repos.d/almalinux.repo
@@ -0,0 +1,13 @@
+[almalinux-baseos]
+name=AlmaLinux-8-BaseOS
+baseurl=https://repo.almalinux.org/almalinux/8/BaseOS/x86_64/os/
+enabled=1
+gpgcheck=1
+gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
+
+[almalinux-appstream]
+name=AlmaLinux-8-AppStream
+baseurl=https://repo.almalinux.org/almalinux/8/AppStream/x86_64/os/
+enabled=1
+gpgcheck=1
+gpgkey=https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
diff --git a/common/jenkins-agents/nodejs22/docker/yum.repos.d/centos8.repo b/common/jenkins-agents/nodejs22/docker/yum.repos.d/centos8.repo
diff --git a/common/jenkins-agents/nodejs22/docker/yum.repos.d/microsoft-edge.repo b/common/jenkins-agents/nodejs22/docker/yum.repos.d/microsoft-edge.repo
@@ -0,0 +1,6 @@
+[edge]
+name=Microsoft Edge Browser
+baseurl=https://packages.microsoft.com/yumrepos/edge
+enabled=0
+gpgcheck=1
+gpgkey=https://packages.microsoft.com/keys/microsoft.asc
diff --git a/e2e-cypress/files/package.json b/e2e-cypress/files/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "start": "npm run cypress:open",
     "cypress:open": "cypress open",
-    "cypress:run": "cypress run --browser=chrome",
+    "cypress:run": "cypress run --browser=edge",
     "cypress:run-installation": "npm run cypress:run -- --config-file cypress-installation.config.ts",
     "cypress:run-integration": "npm run cypress:run -- --config-file cypress-integration.config.ts",
     "cypress:run-acceptance": "npm run cypress:run -- --config-file cypress-acceptance.config.ts",