From 98bd045050dbeb8804016242c9f8acbac7c11691 Mon Sep 17 00:00:00 2001 From: Vaughn Dice Date: Mon, 5 Aug 2019 17:17:58 -0600 Subject: [PATCH] add brigade.json for brigade-utils/KindJob Signed-off-by: Vaughn Dice --- brigade.js | 17 ++++++++--------- brigade.json | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/brigade.js b/brigade.js index d7bc230f9..af56d8d07 100644 --- a/brigade.js +++ b/brigade.js @@ -3,7 +3,8 @@ // Be careful when editing! // ============================================================================ const { events, Job, Group } = require("brigadier"); -const { Check } = require("@brigadecore/brigade-utils"); +// TODO: update to official @brigadcorre/brigade once released with KindJob +const { Check, KindJob } = require("brigade-utils-test"); const projectName = "brigade"; const projectOrg = "brigadecore"; @@ -54,16 +55,14 @@ function e2e() { // Create a new job to run kind-based e2e tests // Spec'd image wraps docker:stable-dind // with make, bash,, git, kubectl, etc. - var job = new Job("test-e2e", "quay.io/vdice/go-dind:v0.1.0"); - job.privileged = true; - - job.tasks = [ - "dockerd-entrypoint.sh &", - "sleep 20", + let kind = new KindJob("test-e2e"); + kind.tasks.push( + "apk add --update --no-cache bash", "cd /src", "make e2e" - ]; - return job; + ); + + return kind; } function buildAndPublishImages(project, version) { diff --git a/brigade.json b/brigade.json index d1f1ace8c..e47ac6664 100644 --- a/brigade.json +++ b/brigade.json @@ -1,5 +1,5 @@ { "dependencies": { - "@brigadecore/brigade-utils": "0.2.0" + "brigade-utils-test": "0.0.5" } } \ No newline at end of file