Add additional flavors, move flaky test

Signed-off-by: Morgan Tocker <[email protected]>

.github/workflows/check_make_parser.yml

@@ -17,7 +17,7 @@ jobs:
 
     - name: Get dependencies
       run: |
-        sudo apt-get update || echo "update failed" 
+        sudo apt-get update
         sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd curl git wget
         sudo service mysql stop
         sudo service etcd stop

.github/workflows/cluster_endtoend.yml

@@ -17,7 +17,7 @@ jobs:
 
     - name: Get dependencies
       run: |
-        sudo apt-get update || echo "update failed"
+        sudo apt-get update
         sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd curl git wget
         sudo service mysql stop
         sudo service etcd stop

.github/workflows/e2e_race.yml

@@ -17,7 +17,7 @@ jobs:
 
     - name: Get dependencies
       run: |
-        sudo apt-get update || echo "update failed"
+        sudo apt-get update
         sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd curl git wget
         sudo service mysql stop
         sudo service etcd stop

.github/workflows/endtoend.yml

@@ -17,7 +17,7 @@ jobs:
 
     - name: Get dependencies
       run: |
-        sudo apt-get update || echo "update failed"
+        sudo apt-get update
         sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd curl git wget
         sudo service mysql stop
         sudo service etcd stop

.github/workflows/local_example.yml

@@ -17,7 +17,7 @@ jobs:
 
     - name: Get dependencies
       run: |
-        sudo apt-get update || echo "update failed"
+        sudo apt-get update
         sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd curl git wget
         sudo service mysql stop
         sudo service etcd stop

.github/workflows/unit.yml

@@ -19,31 +19,59 @@ jobs:
 
     - name: Get dependencies
       run: |
-        sudo apt-get update || echo "update failed"
+        sudo apt-get update
 
         if [ ${{matrix.name}} = "mysql57" ]; then
           sudo apt-get install -y mysql-server mysql-client
-        elif [ ${{matrix.name}} = "mysql80" ]; then
+        else
+          # Uninstall likely installed MySQL first
           sudo apt-get remove -y mysql-server mysql-client
-          sudo rm -rf /var/lib/mysql
-          wget -c https://dev.mysql.com/get/mysql-apt-config_0.8.14-1_all.deb
-          echo mysql-apt-config mysql-apt-config/select-server select mysql-8.0 | sudo debconf-set-selections 
-          sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
-          sudo apt-get update || echo "update failed"
-          sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server mysql-client
-        elif [ ${{matrix.name}} = "mariadb101" ]; then
-          sudo apt-get remove -y mysql-server mysql-client
-          sudo apt install -y mariadb-server mariadb-client
-          sudo bash -c "echo '/usr/sbin/mysqld { }' > /etc/apparmor.d/usr.sbin.mysqld" # https://bugs.launchpad.net/ubuntu/+source/mariadb-10.1/+bug/1806263
+          
+          if [ ${{matrix.name}} = "percona56" ]; then
+            # Currently this fails on vt/vttablet/tabletserver/vstreamer
+            # Once we fix issue #5571 we can enable it.
+            sudo rm -rf /var/lib/mysql
+            wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
+            sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+            sudo apt update
+            sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y percona-server-server-5.6 percona-server-client-5.6  
+          elif [ ${{matrix.name}} = "mysql80" ]; then
+            wget -c https://dev.mysql.com/get/mysql-apt-config_0.8.14-1_all.deb
+            echo mysql-apt-config mysql-apt-config/select-server select mysql-8.0 | sudo debconf-set-selections 
+            sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config*
+            sudo apt-get update
+            sudo DEBIAN_FRONTEND="noninteractive" apt-get install -y mysql-server mysql-client
+          elif [ ${{matrix.name}} = "mariadb101" ]; then
+            sudo apt install -y mariadb-server mariadb-client
+          elif [ ${{matrix.name}} = "mariadb102" ]; then
+            # Currently this fails on vitess.io/vitess/go/mysql
+            # Once we fix issue #5569 we can enable it.
+            sudo apt-get install -y software-properties-common
+            sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8
+            sudo add-apt-repository 'deb [arch=amd64,arm64,ppc64el] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.2/ubuntu bionic main'
+            sudo apt update
+            sudo DEBIAN_FRONTEND="noninteractive" apt install -y mariadb-server
+          elif [ ${{matrix.name}} = "mariadb103" ]; then
+            # Currently this fails on vitess.io/vitess/go/mysql
+            # Once we fix issue #5569 we can enable it.
+            sudo apt-get install -y software-properties-common
+            sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8
+            sudo add-apt-repository 'deb [arch=amd64,arm64,ppc64el] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.3/ubuntu bionic main'
+            sudo apt update
+            sudo DEBIAN_FRONTEND="noninteractive" apt install -y mariadb-server
+          fi
         fi
 
         sudo apt-get install -y make unzip g++ curl git wget ant openjdk-8-jdk
         sudo service mysql stop
+        sudo bash -c "echo '/usr/sbin/mysqld { }' > /etc/apparmor.d/usr.sbin.mysqld" # https://bugs.launchpad.net/ubuntu/+source/mariadb-10.1/+bug/1806263
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
-        sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
+        sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld || echo "could not remove mysqld profile"
+
         mkdir -p dist bin
         curl -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist
         mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
+
         go mod download
 
     - name: Run make tools

.github/workflows/unit_race.yml

@@ -17,12 +17,17 @@ jobs:
 
     - name: Get dependencies
       run: |
-        sudo apt-get update || echo "update failed"
-        sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd curl git wget
+        sudo apt-get update
+        sudo apt-get install -y mysql-server mysql-client make unzip g++ curl git wget
         sudo service mysql stop
         sudo service etcd stop
         sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
+
+        mkdir -p dist bin
+        curl -L https://github.com/coreos/etcd/releases/download/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz | tar -zxC dist
+        mv dist/etcd-v3.3.10-linux-amd64/{etcd,etcdctl} bin/
+
         go mod download
 
     - name: Run make tools