From 354912a6c90a27b023ba2bc73d390d5d35744143 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Fri, 5 Feb 2021 16:29:27 -0500
Subject: [PATCH] Attempt to run CI in stages

---
 Jenkinsfile | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 142298e..485fdbb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@ pipeline {
 		}
 		stage("Test PHP 7.4") {
 			steps {
-				node {
+				script {
 					docker.image("memcached:latest").withRun("-p 11212:11211") { c ->
 						docker.image("redis:latest").withRun("-p 6380:6379") { d ->
 							docker.image("php:7.4").withRun("-e REDIS_HOST=redis -e REDIS_PORT=11212 -e MEMCACHED_HOST=mem -e MEMCACHED_PORT=6380 --link ${d.id}:redis --link ${c.id}:mem") { p ->
@@ -26,7 +26,7 @@ pipeline {
 		}
 		stage("Test PHP 8") {
 			steps {
-				node {
+				script {
 					docker.image("memcached:latest").withRun("-p 11212:11211") { c ->
 						docker.image("redis:latest").withRun("-p 6380:6379") { d ->
 							docker.image("php:8").withRun("-e REDIS_HOST=redis -e REDIS_PORT=11212 -e MEMCACHED_HOST=mem -e MEMCACHED_PORT=6380 --link ${d.id}:redis --link ${c.id}:mem") { p ->
@@ -38,16 +38,14 @@ pipeline {
 				}
 			}
 		}
-		post {
-			success {
-				steps {
-					sh 'php composer.phar run-script coverage'
-					step([
-						$class: 'CloverPublisher',
-						cloverReportDir: '',
-						cloverReportFileName: 'build/logs/clover.xml',
-					])
-				}
+		stage("Coverage") {
+			steps {
+				sh 'php composer.phar run-script coverage'
+				step([
+					$class: 'CloverPublisher',
+					cloverReportDir: '',
+					cloverReportFileName: 'build/logs/clover.xml',
+				])
 			}
 		}
 	}