From 1e63e65aecb8dce66f9443e8a707a1bd991a18f9 Mon Sep 17 00:00:00 2001
From: Simon Laden <simon.laden@payara.fish>
Date: Mon, 14 Oct 2024 14:15:51 +0100
Subject: [PATCH 1/2] FISH-8908-bis - attempt to run the e2e tests in jenkins

---
 Jenkinsfile | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 49a5f7e..f4a1251 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,7 +34,31 @@ pipeline {
                 // Build the project using yarn
                 sh 'yarn install'
                 sh 'yarn run tslint'
-                sh 'yarn run compile'            }
+                sh 'yarn run compile' 
+                sh 'npm run test:e2e'           }
+        }
+
+        stage('Install Xvfb') {
+            steps {
+                script {
+                    // Check if Xvfb is installed, if not, install it
+                    sh '''
+                    if ! command -v Xvfb &> /dev/null
+                    then
+                        echo "Xvfb not found. Installing..."
+                        sudo apt-get update
+                        sudo apt-get install -y xvfb
+                    else
+                        echo "Xvfb is already installed."
+                    fi
+                    '''
+                }
+            }
+        }
+
+        stage('E2E tests') {
+            steps {
+                sh 'npm run test:e2e'           }
         }
     }
 }
\ No newline at end of file

From c513c5f7483c6ab9274138639353161e11823ddd Mon Sep 17 00:00:00 2001
From: Simon Laden <simon.laden@payara.fish>
Date: Mon, 14 Oct 2024 14:33:58 +0100
Subject: [PATCH 2/2] FISH-8908-bis - attempt to run the e2e tests in jenkins

---
 Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f4a1251..68a3adb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,8 +34,7 @@ pipeline {
                 // Build the project using yarn
                 sh 'yarn install'
                 sh 'yarn run tslint'
-                sh 'yarn run compile' 
-                sh 'npm run test:e2e'           }
+                sh 'yarn run compile'         }
         }
 
         stage('Install Xvfb') {