From 8368c91ff47c44e43443b5d1ff8b8a49ef836f10 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Fri, 12 Oct 2018 09:38:24 -0400
Subject: [PATCH] Jenkins CI setup, try four

---
 Jenkinsfile | 58 ++++++++++++++++++++++-------------------------------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6ba5749..1980dd0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,52 +2,42 @@ pipeline {
 	agent none
 	stages {
 		stage('PHP 7') {
-			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'
-							}
+			agent {
+				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') {
-			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'
-							}
+			agent {
+				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') {
-			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'
-							}
+			agent {
+				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'
 						}
 					}
 				}