From d7fa67b8b3fc151dba4fa60873cf6d54068b9a15 Mon Sep 17 00:00:00 2001
From: Kumbirai Tanekha <kumbirai.tanekha@gmail.com>
Date: Thu, 11 Aug 2022 16:14:42 +0100
Subject: [PATCH] Move standard rspec tests into seperate step

---
 Jenkinsfile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bcd6ca194e..b57a50e477 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -264,6 +264,13 @@ pipeline {
           }
         }
 
+        // Run outside parallel block to avoid external pressure
+        stage('Run standard rspec tests') {
+          steps {
+            sh 'ci/test rspec'
+          }
+        }
+
         // Run outside parallel block to reduce main Jenkins executor load.
         stage('Nightly Only') {
           when {
@@ -282,6 +289,8 @@ pipeline {
                 unstash 'version_info'
                 // Catch errors so remaining steps always run.
                 catchError {
+                  sh script: "ci/test rspec", label: "Standard rspec tests"
+
                   runConjurTests(params.RUN_ONLY)
                 }
 
@@ -755,9 +764,6 @@ def testShouldRun(run_only_str, test) {
 def runConjurTests(run_only_str) {
 
   all_tests = [
-    "rspec": [
-      "RSpec - ${env.STAGE_NAME}": { sh 'ci/test rspec' }
-    ],
     "authenticators_config": [
       "Authenticators Config - ${env.STAGE_NAME}": {
         sh 'ci/test authenticators_config'