diff options
| author | Tyler Cipriani <tcipriani@wikimedia.org> | 2018-11-16 15:58:36 -0700 |
|---|---|---|
| committer | Tyler Cipriani <tcipriani@wikimedia.org> | 2018-12-10 11:20:04 -0700 |
| commit | 6597c943b6af809cc30e80070ad42953cab05dc4 (patch) | |
| tree | ddb6a2b156e5aa826916c237e5af536f24bd96c6 | |
| parent | 236d8df84f9f248f58e358448898529d7b81dfc0 (diff) | |
| download | blubber-6597c943b6af809cc30e80070ad42953cab05dc4.tar.gz | |
Combine blubberoid.yaml and .pipeline/blubber.yaml
Change-Id: I726094fd9afa593df31425c86060c4f1d52d8b83
| -rw-r--r-- | .pipeline/blubber.yaml | 16 | ||||
| -rw-r--r-- | blubberoid.yaml | 22 |
2 files changed, 14 insertions, 24 deletions
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] |