Merge pull request mysql#31 from planetscale/dbussink/multi-distro-build

Multi distro build for 8.0 branch

Author: dbussink

.buildkite/hooks/pre-command

@@ -1,6 +1,8 @@
 # vim: set ft=bash:
 set -eu
 
+export MAIN_BRANCH="8.0"
+
 TODAY=$(date +"%Y%m%d")
 [ -n "$TODAY" ]
 echo "Today = \"${TODAY}\""
@@ -21,4 +23,16 @@ export CONTAINER_BRANCH_NAME=$(echo "$BUILDKITE_BRANCH" | sed -e 's/[\/:]/_/g')
 [ -n "$CONTAINER_BRANCH_NAME" ]
 echo "Safe branch name = \"${CONTAINER_BRANCH_NAME}\""
 
+export TARBALL_VERSION="mysql-${CONTAINER_SEMVER}-ps-${CONTAINER_SHORT_SHA}"
+[ -n "$TARBALL_VERSION" ]
+echo "Tarball version = \"${TARBALL_VERSION}\""
+
+export BUILDKITE_ARTIFACT_UPLOAD_DESTINATION="s3://planetscale-mysql-server-private-ci-artifacts/mysql/branch"
+if [ "${CONTAINER_BRANCH_NAME}" = "${MAIN_BRANCH}" ]; then
+  export BUILDKITE_ARTIFACT_UPLOAD_DESTINATION="s3://planetscale-mysql-server-private-ci-artifacts/mysql/main"
+fi
+
+export BUILDKITE_S3_DEFAULT_REGION="us-east-1"
+export BUILDKITE_S3_ACL="private"
+
 mkdir -p dist/

.buildkite/pipeline.yml

@@ -8,17 +8,21 @@ env:
   DOCKER_BUILDKIT: 1
   IMAGE_NAME: "mysql-server"
   REGISTRY: "997601596833.dkr.ecr.us-east-1.amazonaws.com"
-  MAIN_BRANCH: "8.0"
 
 steps:
   - name: "Build mysql-server"
     label: ":docker: Build and package"
     command: bash build.sh
     artifact_paths:
-      - "dist/*.tar.gz"
+      - "dist/mysql-*.tar.gz"
     plugins:
       - docker-compose#v3.10.0:
           run: builder
+    env:
+      DISTRO: "{{matrix}}"
+    matrix:
+      - "debian:bullseye-slim"
+      - "ubuntu:focal"
 
   - wait
 

Dockerfile.build

@@ -1,8 +1,10 @@
-FROM debian:bullseye-slim
+ARG BASE_IMAGE=debian:bullseye-slim
+FROM $BASE_IMAGE
 
 RUN apt-get update && apt-get upgrade -y
 
 ENV DEBIAN_FRONTEND noninteractive
+ENV DISTRO $BASE_IMAGE
 
 ADD --chown=1234 . /src
 WORKDIR /src

Dockerfile.release

@@ -2,18 +2,18 @@
 
 # Since we can't strip-components with ADD, we'll need to manually extract it
 FROM debian:bullseye-slim as mysql-dist
-ARG MYSQL_VERSION
+ARG TARBALL_VERSION
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && \
     apt-get install -y \
       binutils
 
-COPY mysql-${MYSQL_VERSION}-linux-x86_64.tar.gz /dist/
+COPY ${TARBALL_VERSION}-bullseye-linux-x86_64.tar.gz /dist/
 
 RUN mkdir /dist/usr && \
-    tar -xzvf /dist/mysql-${MYSQL_VERSION}-linux-x86_64.tar.gz -C /dist/usr --strip-components=1
+    tar -xzvf /dist/${TARBALL_VERSION}-bullseye-linux-x86_64.tar.gz -C /dist/usr --strip-components=1
 
 FROM debian:bullseye-slim
 

build.sh

@@ -50,3 +50,8 @@ make -j $(nproc)
 DISABLE_IPV6_TESTS=1 DISABLE_TMPFILE_TESTS=1 make test ARGS="-j $(nproc) -E ^routertest -VV"
 
 make -j $(nproc) package
+
+distro="$(lsb_release -c -s)"
+source ../MYSQL_VERSION
+
+mv "mysql-${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}-linux-$(uname -m).tar.gz" "${TARBALL_VERSION}-${distro}-linux-$(uname -m).tar.gz"

docker-compose.yml

@@ -5,14 +5,16 @@ services:
     build:
       context: ./
       dockerfile: Dockerfile.build
+      args:
+        - BASE_IMAGE=${DISTRO}
     volumes:
       - "./dist:/dist"
+    environment:
+      - TARBALL_VERSION=${TARBALL_VERSION}
 
   release:
     build:
       context: ./dist
       dockerfile: ../Dockerfile.release
       args:
-        - MYSQL_VERSION=${MYSQL_VERSION:?}
-    environment:
-      - BUILDKITE_BRANCH=${BUILDKITE_BRANCH}
+        - TARBALL_VERSION=${TARBALL_VERSION:?}