From 6597c943b6af809cc30e80070ad42953cab05dc4 Mon Sep 17 00:00:00 2001
From: Tyler Cipriani <tcipriani@wikimedia.org>
Date: Fri, 16 Nov 2018 15:58:36 -0700
Subject: Combine blubberoid.yaml and .pipeline/blubber.yaml

Change-Id: I726094fd9afa593df31425c86060c4f1d52d8b83
---
 .pipeline/blubber.yaml | 16 ++++++++++++++--
 blubberoid.yaml        | 22 ----------------------
 2 files changed, 14 insertions(+), 24 deletions(-)
 delete mode 100644 blubberoid.yaml

diff --git a/.pipeline/blubber.yaml b/.pipeline/blubber.yaml
index af20bb8..81efaf6 100644
--- a/.pipeline/blubber.yaml
+++ b/.pipeline/blubber.yaml
@@ -1,10 +1,22 @@
 version: v3
-base: golang:1.9-stretch
-lives: { in: /go/src/gerrit.wikimedia.org/r/blubber }
+base: docker-registry.wikimedia.org/wikimedia-stretch:latest
+lives:
+  in: /go/src/gerrit.wikimedia.org/r/blubber
 
 variants:
+  build:
+    base: golang:1.9-stretch
   test:
+    includes: [build]
     runs: { insecurely: true }
     builder:
       command: [go, get, -u, golang.org/x/lint/golint]
     entrypoint: [make, test]
+  prep:
+    includes: [build]
+    builder:
+      command: [make, blubberoid]
+      requirements: [.]
+  production:
+    copies: prep
+    entrypoint: [./blubberoid]
diff --git a/blubberoid.yaml b/blubberoid.yaml
deleted file mode 100644
index 4947684..0000000
--- a/blubberoid.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-version: v3
-base: docker-registry.wikimedia.org/wikimedia-stretch:latest
-lives:
-  in: /app/go/src/gerrit.wikimedia.org/r/blubber
-runs:
-  environment:
-    GOPATH: /app/go
-
-variants:
-  build:
-    apt:
-      packages:
-        - build-essential
-        - git
-        - golang-go
-    builder:
-      requirements: [.]
-      command: [go, build, ./cmd/blubberoid]
-
-  production:
-    copies: build
-    entrypoint: [./blubberoid]
-- 
cgit v1.2.1