From 6cc1a1a34e27a301fb755ff21646acc9f3f7cdf0 Mon Sep 17 00:00:00 2001
From: Shlomi Noach <shlomi-noach@github.com>
Date: Thu, 15 Aug 2019 11:10:48 +0300
Subject: [PATCH] CI: adapting to internal builds system

---
 Dockerfile.test                            | 11 ++++
 docker-compose.yml                         |  7 +++
 script/bootstrap                           |  1 +
 script/build-deploy-tarball                | 35 ++++++++++++
 script/cibuild                             | 16 +-----
 script/cibuild-gh-ost-build-deploy-tarball | 66 +++++++++++++---------
 script/test                                | 17 ++++++
 7 files changed, 110 insertions(+), 43 deletions(-)
 create mode 100644 Dockerfile.test
 create mode 100644 docker-compose.yml
 create mode 100644 script/build-deploy-tarball
 create mode 100644 script/test

diff --git a/Dockerfile.test b/Dockerfile.test
new file mode 100644
index 0000000..6abc4a0
--- /dev/null
+++ b/Dockerfile.test
@@ -0,0 +1,11 @@
+FROM golang:1.12.1
+LABEL maintainer="github@github.com"
+
+RUN apt-get update
+RUN apt-get install -y lsb-release
+RUN rm -rf /var/lib/apt/lists/*
+
+COPY . /go/src/github.com/github/gh-ost
+WORKDIR /go/src/github.com/github/gh-ost
+
+CMD ["script/test"]
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..8a2bd2e
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,7 @@
+version: "3.5"
+services:
+  app:
+    image: app
+    build:
+      context: .
+      dockerfile: Dockerfile.test
diff --git a/script/bootstrap b/script/bootstrap
index 6ac885b..573313a 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -4,6 +4,7 @@ set -e
 
 # Make sure we have the version of Go we want to depend on, either from the
 # system or one we grab ourselves.
+# If executing from within Dockerfile then this assumption is inherently true, since we use a `golang` docker image.
 . script/ensure-go-installed
 
 # Since we want to be able to build this outside of GOPATH, we set it
diff --git a/script/build-deploy-tarball b/script/build-deploy-tarball
new file mode 100644
index 0000000..d36b6c9
--- /dev/null
+++ b/script/build-deploy-tarball
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+set -e
+
+script/build
+
+# Get a fresh directory and make sure to delete it afterwards
+build_dir=tmp/build
+rm -rf $build_dir
+mkdir -p $build_dir
+trap "rm -rf $build_dir" EXIT
+
+commit_sha=$(git rev-parse HEAD)
+
+if [ $(uname -s) = "Darwin" ]; then
+    build_arch="$(uname -sr | tr -d ' ' | tr '[:upper:]' '[:lower:]')-$(uname -m)"
+else
+    build_arch="$(lsb_release -sc | tr -d ' ' | tr '[:upper:]' '[:lower:]')-$(uname -m)"
+fi
+
+tarball=$build_dir/${commit_sha}-${build_arch}.tar
+
+# Create the tarball
+tar cvf $tarball --mode="ugo=rx" bin/
+
+# Compress it and copy it to the directory for the CI to upload it
+gzip $tarball
+mkdir -p "$BUILD_ARTIFACT_DIR"/gh-ost
+cp ${tarball}.gz "$BUILD_ARTIFACT_DIR"/gh-ost/
+
+### HACK HACK HACK ###
+# blame @carlosmn and @mattr-
+# Allow builds on stretch to also be used for jessie
+jessie_tarball_name=$(echo $(basename "${tarball}") | sed s/-stretch-/-jessie-/)
+cp ${tarball}.gz "$BUILD_ARTIFACT_DIR/gh-ost/${jessie_tarball_name}.gz"
diff --git a/script/cibuild b/script/cibuild
index 7e757b5..e609b7a 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -1,17 +1,3 @@
 #!/bin/bash
 
-set -e
-
-. script/bootstrap
-
-echo "Verifying code is formatted via 'gofmt -s -w  go/'"
-gofmt -s -w  go/
-git diff --exit-code --quiet
-
-echo "Building"
-script/build
-
-cd .gopath/src/github.com/github/gh-ost
-
-echo "Running unit tests"
-go test ./go/...
+script/test
diff --git a/script/cibuild-gh-ost-build-deploy-tarball b/script/cibuild-gh-ost-build-deploy-tarball
index 692b42b..a852ad6 100755
--- a/script/cibuild-gh-ost-build-deploy-tarball
+++ b/script/cibuild-gh-ost-build-deploy-tarball
@@ -1,37 +1,47 @@
-#!/bin/sh
+#!/bin/bash
 
-set -e
+output_fold() {
+  # Exit early if no label provided
+  if [ -z "$1" ]; then
+    echo "output_fold(): requires a label argument."
+    return
+  fi
 
-script/cibuild
+  exit_value=0  # exit_value is used to record exit status of the given command
+  label=$1      # human-readable label describing what's being folded up
+  shift 1       # having retrieved the output_fold()-specific arguments, strip them off $@
 
-# Get a fresh directory and make sure to delete it afterwards
-build_dir=tmp/build
-rm -rf $build_dir
-mkdir -p $build_dir
-trap "rm -rf $build_dir" EXIT
+  # Only echo the tags when in CI_MODE
+  if [ "$CI_MODE" ]; then
+    echo "%%%FOLD {$label}%%%"
+  fi
 
-commit_sha=$(git rev-parse HEAD)
+  # run the remaining arguments. If the command exits non-0, the `||` will
+  # prevent the `-e` flag from seeing the failure exit code, and we'll see
+  # the second echo execute
+  "$@" || exit_value=$?
 
-if [ $(uname -s) = "Darwin" ]; then
-    build_arch="$(uname -sr | tr -d ' ' | tr '[:upper:]' '[:lower:]')-$(uname -m)"
-else
-    build_arch="$(lsb_release -sc | tr -d ' ' | tr '[:upper:]' '[:lower:]')-$(uname -m)"
-fi
+  # Only echo the tags when in CI_MODE
+  if [ "$CI_MODE" ]; then
+    echo "%%%END FOLD%%%"
+  fi
 
-tarball=$build_dir/${commit_sha}-${build_arch}.tar
+  # preserve the exit code from the subcommand.
+  return $exit_value
+}
 
-# Create the tarball
-tar cvf $tarball --mode="ugo=rx" bin/
+function cleanup() {
+  echo
+  echo "%%%FOLD {Shutting down services...}%%%"
+  docker-compose down
+  echo "%%%END FOLD%%%"
+}
 
-# Compress it and copy it to the directory for the CI to upload it
-gzip $tarball
-mkdir -p "$BUILD_ARTIFACT_DIR"/gh-ost
-cp ${tarball}.gz "$BUILD_ARTIFACT_DIR"/gh-ost/
+trap cleanup EXIT
 
-### HACK HACK HACK ###
-# Blame @carlosmn. In the good way.
-# We don't have any jessie machines for building, but a pure-Go binary depends
-# on a version of libc and ld which are widely available, so we can copy the
-# tarball over with jessie in its name so we can deploy it on jessie machines.
-jessie_tarball_name=$(echo $(basename "${tarball}") | sed s/-precise-/-jessie-/)
-cp ${tarball}.gz "$BUILD_ARTIFACT_DIR/gh-ost/${jessie_tarball_name}.gz"
+export CI_MODE=true
+
+output_fold "Bootstrapping container..." docker-compose build
+output_fold "Running tests..." docker-compose run --rm app
+
+docker-compose run -e BUILD_ARTIFACT_DIR=$BUILD_ARTIFACT_DIR -v $BUILD_ARTIFACT_DIR:$BUILD_ARTIFACT_DIR app script/build-deploy-tarball
diff --git a/script/test b/script/test
new file mode 100644
index 0000000..7e757b5
--- /dev/null
+++ b/script/test
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+. script/bootstrap
+
+echo "Verifying code is formatted via 'gofmt -s -w  go/'"
+gofmt -s -w  go/
+git diff --exit-code --quiet
+
+echo "Building"
+script/build
+
+cd .gopath/src/github.com/github/gh-ost
+
+echo "Running unit tests"
+go test ./go/...