From afac36957393f246f8a722e5a90228a271f406d1 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Fri, 5 Feb 2021 14:57:22 -0500
Subject: [PATCH] Attempt to fix tests

---
 Jenkinsfile | 45 ++++++++++++++++++---------------------------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5806b8b..30f9d59 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,32 +1,23 @@
 node {
-	stage("php 7.4") {
-		docker.image('memcached:latest').withRun('-p 11212:11211').inside {
-			docker.image('redis:latest').withRun('-p 6380:6379').inside {
-				docker.image('php:7.4') {
-					checkout scm
-					steps {
-						sh 'sh build/docker_install.sh > /dev/null'
-						sh 'curl -sS https://getcomposer.org/installer | php'
-						sh 'php composer.phar install --ignore-platform-reqs'
-						sh 'phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never'
-					}
+	checkout scm
+	docker.image('memcached:latest').withRun("-p 11212:11211") { c ->
+		docker.image('redis:latest').withRun("-p 6380:6379") { d ->
+			docker.image('php:7.4') {
+				steps {
+					sh 'sh build/docker_install.sh > /dev/null'
+					sh 'curl -sS https://getcomposer.org/installer | php'
+					sh 'php composer.phar install --ignore-platform-reqs'
+					sh 'phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never'
+				}
+			}
+			docker.image('php:8') {
+				steps {
+					sh 'sh build/docker_install.sh > /dev/null'
+					sh 'curl -sS https://getcomposer.org/installer | php'
+					sh 'php composer.phar install --ignore-platform-reqs'
+					sh 'phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never'
 				}
 			}
 		}
 	}
-	stage("php 8") {
-		docker.image('memcached:latest').withRun('-p 11212:11211').inside {
-			docker.image('redis:latest').withRun('-p 6380:6379').inside {
-				docker.image('php:8') {
-					checkout scm
-					steps {
-						sh 'sh build/docker_install.sh > /dev/null'
-						sh 'curl -sS https://getcomposer.org/installer | php'
-						sh 'php composer.phar install --ignore-platform-reqs'
-						sh 'phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never'
-					}
-				}
-			}
-		}
-	}
-}
+}
\ No newline at end of file