Update buildkite workers (uber#436)

.buildkite/pipeline.yml

@@ -1,16 +1,53 @@
 steps:
-  - name: ':docker: :package:'
+  - name: ':docker: :package: buildkite'
     plugins:
       - docker-compose#v3.0.2:
           build: buildkite
           image-repository: 027047743804.dkr.ecr.us-east-2.amazonaws.com/uber
     agents:
       queue: builders
+  - name: ':docker: :package: app'
+    plugins:
+      - docker-compose#v3.0.2:
+          build: app
+          image-repository: 027047743804.dkr.ecr.us-east-2.amazonaws.com/uber
+    agents:
+      queue: builders
   - wait
-  - name: ':make:'
-    command: make all codecov
+  - name: 'make lint'
+    command: make lint
+    plugins:
+      - docker-compose#v3.0.2:
+          run: buildkite
+    agents:
+      queue: workers
+  - name: 'make codecov'
+    command: make codecov
+    plugins:
+      - docker-compose#v3.0.2:
+          run: buildkite
+    agents:
+      queue: workers
+  - name: 'make bazeltest'
+    command: make bazeltest
+    plugins:
+      - docker-compose#v3.0.2:
+          run: buildkite
+    agents:
+      queue: workers
+  - name: 'make bazelbuild'
+    command: make bazelbuild
     plugins:
       - docker-compose#v3.0.2:
           run: buildkite
     agents:
       queue: workers
+  - name: 'docker test'
+    command: bash etc/docker/testing/bin/test.sh
+    plugins:
+      - docker-compose#v3.0.2:
+          run: app
+          volumes:
+            - "./:/work"
+    agents:
+      queue: workers

Dockerfile.buildkite

@@ -1,8 +1,7 @@
 FROM golang:1.12.4-stretch
 
-ENV GO111MODULE=on
-ENV GOPATH=
-
+ENV GO111MODULE=on \
+  GOPATH=
 RUN apt-get update -yq && \
   apt-get install -yq build-essential unzip && \
   rm -rf /var/lib/apt/lists/*

Makefile

@@ -215,7 +215,7 @@ cover:
 	@echo open $(TMP_ETC)/coverage.html
 
 .PHONY: codecov
-codecov:
+codecov: cover
 	bash <(curl -s https://codecov.io/bash) -c -f $(TMP_ETC)/coverage.txt
 
 .PHONY: bazeltest

docker-compose.yml

@@ -20,3 +20,9 @@ services:
       - BUILDKITE_PROJECT_SLUG
       - BUILDKITE_PULL_REQUEST
       - BUILDKITE_TAG
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      cache_from:
+        - golang:1.12.4-alpine3.9

etc/docker/testing/bin/test.sh

@@ -27,11 +27,14 @@ check_command_output() {
 }
 
 check_command_output_file() {
-  tmp_file="$(mktemp)"
-  trap 'rm -rf "${tmp_file}"' EXIT
+  tmp_file1="$(mktemp)"
+  tmp_file2="$(mktemp)"
+  trap 'rm -rf "${tmp_file1}"' EXIT
+  trap 'rm -rf "${tmp_file2}"' EXIT
   echo "Checking that '${*:2}' results in the contents of '${1}'"
-  "${@:2}" > "${tmp_file}"
-  if ! diff "${1}" "${tmp_file}"; then
+  cat "${1}" | sort > "${tmp_file1}"
+  "${@:2}" | sort > "${tmp_file2}"
+  if ! diff "${tmp_file1}" "${tmp_file2}"; then
     echo "Diff detected" >&2
     exit 1
   fi