From b23eacbd9eed20c1150088eea488134ea10a660b Mon Sep 17 00:00:00 2001
From: Siddarth Kumar <siddarthkay@gmail.com>
Date: Fri, 9 Aug 2024 23:04:02 +0530
Subject: [PATCH] ci: run E2E as soon as linux stage is complete

---
 ci/Jenkinsfile.combined | 46 +++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined
index c4ea2aac9d..ca45e70fff 100644
--- a/ci/Jenkinsfile.combined
+++ b/ci/Jenkinsfile.combined
@@ -33,11 +33,34 @@ pipeline {
   stages {
     stage('Build') {
       parallel {
-        stage('Linux/x86_64') { steps { script {
-          linux_x86_64 = getArtifacts(
-            'Linux', jenkins.Build('status-desktop/systems/linux/x86_64/package')
-          )
-        } } }
+        stage('Linux/x86_64 and E2E') {
+          stages {
+            stage('Linux/x86_64') {
+              steps {
+                script {
+                  linux_x86_64 = getArtifacts(
+                    'Linux', jenkins.Build('status-desktop/systems/linux/x86_64/package')
+                  )
+                }
+              }
+            }
+            stage('E2E') {
+              steps {
+                script {
+                  linux_e2e = build(
+                    job: 'status-desktop/systems/linux/x86_64/tests-e2e-new',
+                    parameters: jenkins.mapToParams([
+                      BUILD_SOURCE:       linux_x86_64.fullProjectName,
+                      TESTRAIL_RUN_NAME:  utils.pkgFilename(),
+                      TEST_SCOPE_FLAG:    utils.isReleaseBuild() ? '-m=critical' : '',
+                      GIT_REF:            env.BRANCH_NAME,
+                    ]),
+                  )
+                }
+              }
+            }
+          }
+        }
         stage('Linux/x86_64/Nix') { steps { script {
           linux_x86_64_nix = getArtifacts(
             'Linux', jenkins.Build('status-desktop/systems/linux/x86_64/package-nix')
@@ -60,19 +83,6 @@ pipeline {
         } } }
       }
     }
-    stage('E2E') {
-      steps { script {
-        linux_e2e = build(
-          job: 'status-desktop/systems/linux/x86_64/tests-e2e-new',
-          parameters: jenkins.mapToParams([
-            BUILD_SOURCE:       linux_x86_64.fullProjectName,
-            TESTRAIL_RUN_NAME:  utils.pkgFilename(),
-            TEST_SCOPE_FLAG:    utils.isReleaseBuild() ? '-m=critical' : '',
-            GIT_REF:            env.BRANCH_NAME,
-          ]),
-        )
-      } }
-    }
     stage('Publish') {
       when { expression { params.PUBLISH } }
       steps { script {