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

---
 Jenkinsfile             | 25 ++++++++++++++-----------
 build/docker_install.sh |  6 ------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 14bfc76..6f9d765 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,27 +11,30 @@ pipeline {
 			}
 		}
 		stage("Test PHP 7.4") {
-			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 ->
-						sh "sh build/docker_install.sh > /dev/null"
-						sh "php ./vendor/bin/phpunit -c build --no-coverage --colors=never"
+			steps {
+				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 ->
+							sh "sh build/docker_install.sh"
+							sh "php ./vendor/bin/phpunit -c build --no-coverage --colors=never"
+						}
 					}
 				}
 			}
 		}
 		stage("Test PHP 8") {
-			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 ->
-						sh "sh build/docker_install.sh > /dev/null"
-						sh "php ./vendor/bin/phpunit -c build --no-coverage --colors=never"
+			steps {
+				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 ->
+							sh "sh build/docker_install.sh"
+							sh "php ./vendor/bin/phpunit -c build --no-coverage --colors=never"
+						}
 					}
 				}
 			}
 		}
 		stage("Coverage") {
-			agent any
 			steps {
 				sh 'php composer.phar run-script coverage'
 				step([
diff --git a/build/docker_install.sh b/build/docker_install.sh
index 61c4812..0e92bab 100644
--- a/build/docker_install.sh
+++ b/build/docker_install.sh
@@ -5,12 +5,6 @@
 
 set -xe
 
-# Install git (the php image doesn't have it) which is required by composer
-#echo -e 'http://dl-cdn.alpinelinux.org/alpine/edge/main\nhttp://dl-cdn.alpinelinux.org/alpine/edge/community\nhttp://dl-cdn.alpinelinux.org/alpine/edge/testing' > /etc/apk/repositories
-#apk upgrade --update --no-cache \
-#	curl \
-#	git
-
 apt-get update && apt-get install -y \
 	libz-dev \
 	libmemcached-dev \