From 07de87d69d22554724ddd48effc137c971b12c1f Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Fri, 12 Oct 2018 09:31:30 -0400
Subject: [PATCH] Jenkins CI setup, try three

---
 Jenkinsfile | 61 +++++++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ad3ff8a..6ba5749 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,45 +2,52 @@ pipeline {
 	agent none
 	stages {
 		stage('PHP 7') {
-			node {
-				checkout scm
-				docker.image('memcached:latest').withRun('-p 11211:11211') { c ->
-					docker.image('redis:latest').withRun('-p 6379:6379') { d ->
-						docker.image('php:7') {
-							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'
+			steps {
+				node {
+					checkout scm
+					docker.image('memcached:latest').withRun('-p 11211:11211') { c ->
+						docker.image('redis:latest').withRun('-p 6379:6379') { d ->
+							docker.image('php:7') {
+								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.1') {
-			node {
-				checkout scm
-				docker.image('memcached:latest').withRun('-p 11211:11211') { c ->
-					docker.image('redis:latest').withRun('-p 6379:6379') { d ->
-						docker.image('php:7.1') {
-							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'
+			steps {
+				node {
+					checkout scm
+					docker.image('memcached:latest').withRun('-p 11211:11211') { c ->
+						docker.image('redis:latest').withRun('-p 6379:6379') { d ->
+							docker.image('php:7.1') {
+								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.2') {
-			node {
-				checkout scm
-				docker.image('memcached:latest').withRun('-p 11211:11211') { c ->
-					docker.image('redis:latest').withRun('-p 6379:6379') { d ->
-						docker.image('php:7.2') {
-							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'
+			steps {
+				node {
+					checkout scm
+					docker.image('memcached:latest').withRun('-p 11211:11211') { c ->
+						docker.image('redis:latest').withRun('-p 6379:6379') { d ->
+							docker.image('php:7.2') {
+								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'
+							}
 						}
 					}
 				}