Merge pull request mysql#45 from planetscale/piki/e2e-tests-on-main

Run integration tests

Author: piki

.buildkite/pipeline.yml

@@ -11,6 +11,7 @@ env:
 
 steps:
   - name: "Build mysql-server"
+    key: "build"
     label: ":docker: Build and package"
     command: bash build.sh
     artifact_paths:
@@ -25,9 +26,19 @@ steps:
       - "ubuntu:focal"
       - "ubuntu:jammy"
 
-  - wait
+  - name: "Integration tests on debug build"
+    label: ":docker: Build a debug binary and run integration tests"
+    command: bash integration-tests.sh
+    agents:
+      queue: whopper
+    plugins:
+      - docker-compose#v3.10.0:
+          run: builder
+    env:
+      DISTRO: "debian:bullseye-slim"
 
   - name: "Build runtime mysql-server container for branch"
+    depends_on: "build"
     label: ":docker: Build runtime branch container"
     command: "/usr/sbin/mysqld -V"
     branches: "!${MAIN_BRANCH}"
@@ -42,6 +53,7 @@ steps:
             - "release:${REGISTRY}/branch/${IMAGE_NAME}:${CONTAINER_SEMVER}-ps-${CONTAINER_SHORT_SHA}-${CONTAINER_BRANCH_NAME}"
 
   - name: "Build runtime mysql-server container for main"
+    depends_on: "build"
     label: ":docker: Build runtime main container"
     command: "/usr/sbin/mysqld -V"
     branches: "${MAIN_BRANCH}"

Dockerfile.build

@@ -29,6 +29,8 @@ RUN apt-get install -y \
       libssl-dev \
       net-tools \
       git-core \
+      zip \
+      unzip \
       tzdata
 
 RUN adduser --disabled-password --no-create-home --gecos '' bob --uid 1234

_planetscale/docs/README.md

@@ -20,7 +20,7 @@ The public repo has only one branch, `8.0`, which is a fork of the upstream `8.0
 
 ```sh
 git co -- README
-rm -r .buildkite/ .dockerignore Dockerfile.* _planetscale/ build.sh docker-compose.yml
+rm -r .buildkite/ .dockerignore Dockerfile.* _planetscale/ build.sh integration-tests.sh docker-compose.yml
 ```
 
 The public repo has one tag per image that we have deployed broadly, with the format `8.0.30-ps1`.  In general, create a commit only when rolling out a new image, which means there will be one tag per commit.  The semver in each tag is the upstream version the build is based on.  The final number (`1` in `ps1`) in each tag is sequential and has no semantic (i.e., compatibility) meaning.

build.sh

@@ -3,7 +3,9 @@
 set -e
 
 if [ $(id -u) -eq 0 ]; then
-  su bob -c ./build.sh
+  cd "$(dirname ${0})"
+  SCRIPT="$(basename ${0})"
+  su bob -c "./${SCRIPT}"
   cp build/*.tar.gz /dist/
   exit
 fi

client/mysql.cc

@@ -3400,7 +3400,7 @@ static int com_go(String *buffer, char *line [[maybe_unused]]) {
     if (info) {
       if (info[0])
         put_info(mysql_info(&mysql), INFO_RESULT);
-      else if (info[1])
+      else if (info[1] && getenv("MYSQL_METRICS"))
         printf("Metrics: %s\n", info+1);
     }
     put_info("", INFO_RESULT);  // Empty row

client/mysqltest.cc

@@ -8353,7 +8353,7 @@ static void append_info(DYNAMIC_STRING *ds, ulonglong affected_rows,
   char buf[40], buff2[21];
   sprintf(buf, "affected rows: %s\n", llstr(affected_rows, buff2));
   dynstr_append(ds, buf);
-  if (info) {
+  if (info && info[0]) {
     dynstr_append(ds, "info: ");
     dynstr_append(ds, info);
     dynstr_append_mem(ds, "\n", 1);

integration-tests.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+set -e
+
+if [ $(id -u) -eq 0 ]; then
+  cd "$(dirname ${0})"
+  SCRIPT="$(basename ${0})"
+  su bob -c "./${SCRIPT}"
+  exit
+fi
+
+if [ -d build ]; then
+  rm -rf build
+fi
+
+mkdir build
+cd build
+
+cmake \
+  -DWITH_BOOST=boost-lib \
+  -DDOWNLOAD_BOOST=1 \
+  -DBUILD_CONFIG=mysql_release \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DSYSCONFDIR=/etc/mysql \
+  -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+  -DWITH_MECAB=system \
+  -DWITH_NUMA=ON \
+  -DCOMPILATION_COMMENT="PlanetScale MySQL" \
+  -DCOMPILATION_COMMENT_SERVER="PlanetScale MySQL Server" \
+  -DINSTALL_LAYOUT=DEB \
+  -DREPRODUCIBLE_BUILD=OFF \
+\
+  -DENABLED_PROFILING=0 \
+  -DENABLE_GCOV=0 \
+  -DENABLE_GPROF=0 \
+  -DWITH_CLIENT_PROTOCOL_TRACING=0 \
+  -DWITH_DEBUG=1 \
+  -DWITH_INNODB_EXTRA_DEBUG=0 \
+  -DWITH_KERBEROS=none \
+  -DINSTALL_MYSQLTESTDIR=\
+  -DWITH_ROUTER=OFF \
+  ..
+
+echo Building on $(nproc) cores
+
+make -j $(nproc)
+
+cd runtime_output_directory
+[ -e mysqld ] || ln -s mysqld-debug mysqld
+cd ../mysql-test
+export MTR_MAX_TEST_FAIL=1000
+MTR_PARALLELISM=$[$(nproc) / 2]
+./mysql-test-run --force --skip-ndb --nounit-tests --parallel=$MTR_PARALLELISM