Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add edge to nodejs agents + change dependencies repo #1063

Merged
merged 8 commits into from
Oct 1, 2024
Merged

Add edge to nodejs agents + change dependencies repo #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d42be9f
install microsoft edge in nodejs agents for using with cypress
roicarrera Sep 25, 2024
de91f3c
changed centos8 repository to almalinux due to deprecation
roicarrera Sep 25, 2024
50f6a97
Merge pull request #1 from roicarrera/feature/add_edge_to_nodejs_agent
roicarrera Sep 25, 2024
0ceb010
update CHANGELOG.md
roicarrera Sep 26, 2024
a52c1af
Merge pull request #2 from roicarrera/feature/add_edge_to_nodejs_agent
roicarrera Sep 26, 2024
f2aee88
run cypress with edge
roicarrera Sep 26, 2024
d381de0
Merge pull request #3 from roicarrera/feature/add_edge_to_nodejs_agent
roicarrera Sep 26, 2024
9994ce9
make edge repository disabled by default and only enable it to instal…
BraisVQ Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion common/jenkins-agents/nodejs16/docker/Dockerfile.ubi8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/ && \
Expand Down
13 changes: 13 additions & 0 deletions common/jenkins-agents/nodejs16/docker/yum.repos.d/almalinux.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
13 changes: 0 additions & 13 deletions common/jenkins-agents/nodejs16/docker/yum.repos.d/centos8.repo
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions common/jenkins-agents/nodejs16/docker/yum.repos.d/microsoft-edge.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion common/jenkins-agents/nodejs18/docker/Dockerfile.ubi8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/ && \
Expand Down
13 changes: 13 additions & 0 deletions common/jenkins-agents/nodejs18/docker/yum.repos.d/almalinux.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
13 changes: 0 additions & 13 deletions common/jenkins-agents/nodejs18/docker/yum.repos.d/centos8.repo
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions common/jenkins-agents/nodejs18/docker/yum.repos.d/microsoft-edge.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion common/jenkins-agents/nodejs20/docker/Dockerfile.ubi8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/ && \
Expand Down
13 changes: 13 additions & 0 deletions common/jenkins-agents/nodejs20/docker/yum.repos.d/almalinux.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
13 changes: 0 additions & 13 deletions common/jenkins-agents/nodejs20/docker/yum.repos.d/centos8.repo
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions common/jenkins-agents/nodejs20/docker/yum.repos.d/microsoft-edge.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion common/jenkins-agents/nodejs22/docker/Dockerfile.ubi8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/ && \
Expand Down
13 changes: 13 additions & 0 deletions common/jenkins-agents/nodejs22/docker/yum.repos.d/almalinux.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
13 changes: 0 additions & 13 deletions common/jenkins-agents/nodejs22/docker/yum.repos.d/centos8.repo
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions common/jenkins-agents/nodejs22/docker/yum.repos.d/microsoft-edge.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion e2e-cypress/files/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down