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

---
 Jenkinsfile | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 81c05a6..5806b8b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,21 +1,30 @@
 node {
-	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'
+	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'
+					}
 				}
 			}
-			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'
+					}
 				}
 			}
 		}