From ee32b05a362a36446f7d55b0e637c7e879296a24 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Tue, 16 Dec 2014 14:23:15 -0800 Subject: [PATCH] test against both buildstep release and master --- Makefile | 2 +- wercker.yml | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 842539b68..d85e6691c 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ DOKKU_VERSION = master SSHCOMMAND_URL ?= https://raw.github.com/progrium/sshcommand/master/sshcommand PLUGINHOOK_URL ?= https://s3.amazonaws.com/progrium-pluginhook/pluginhook_0.1.0_amd64.deb STACK_URL ?= https://github.com/progrium/buildstep.git -PREBUILT_STACK_URL ?= https://github.com/progrium/buildstep/releases/download/2014-03-08/2014-03-08_429d4a9deb.tar.gz +PREBUILT_STACK_URL ?= https://github.com/progrium/buildstep/releases/download/2014-12-16/2014-12-16_42bd9f4aab.tar.gz DOKKU_ROOT ?= /home/dokku PLUGINS_PATH ?= /var/lib/dokku/plugins diff --git a/wercker.yml b/wercker.yml index a9bc8db34..1a0992b7a 100644 --- a/wercker.yml +++ b/wercker.yml @@ -1,4 +1,5 @@ box: wercker-labs/docker +no-response-timeout: 20 build: steps: - script: @@ -22,5 +23,11 @@ build: name: unit tests code: sudo -E make -e unit-tests - script: - name: deploy tests + name: deploy tests (against buildstep release) code: sudo -E make -e deploy-tests + - script: + name: deploy tests (against buildstep master) + code: |- + sudo docker rmi -f progrium/buildstep + sudo -E BUILD_STACK=true make -e stack + sudo -E make -e deploy-tests