pin mariadb version in chaos (#1865) (#1866)

pingcap · Jul 14, 2021 · a0247ec · a0247ec
1 parent 1f0ca8b
commit a0247ec
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/binlog-999999.yml b/.github/workflows/binlog-999999.yml
@@ -67,6 +67,15 @@ jobs:
           sudo bash -c "echo './mysql-bin.999998' > /tmp/mysql2-data/mysql-bin.index"
           docker-compose -f ./tests/binlog_999999/docker-compose.yml up -d
 
+          while ! mysqladmin -h127.0.0.1 -P3306 -p123456 -uroot ping --connect-timeout=1 > /dev/null 2>&1 ; do
+            echo "wait mysql"
+            sleep 1
+          done
+          while ! mysqladmin -h127.0.0.1 -P3307 -p123456 -uroot ping --connect-timeout=1 > /dev/null 2>&1 ; do
+            echo "wait mysql"
+            sleep 1
+          done
+
       - name: Run test cases
         run: |
           RESET_MASTER=false make integration_test CASE=incremental_mode

diff --git a/chaos/manifests/sources.yaml b/chaos/manifests/sources.yaml
@@ -61,7 +61,7 @@ spec:
         name: mysql57
       spec:
         accessModes:
-        - ReadWriteOnce
+          - ReadWriteOnce
         resources:
           requests:
             storage: 5Gi
@@ -87,7 +87,7 @@ spec:
     spec:
       containers:
         - name: mysql8
-          image: mysql:8.0.23
+          image: mysql:8.0.23 # use latest after TiDB support utf8mb3
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - mountPath: "/var/lib/mysql"
@@ -109,7 +109,7 @@ spec:
         name: mysql8
       spec:
         accessModes:
-        - ReadWriteOnce
+          - ReadWriteOnce
         resources:
           requests:
             storage: 5Gi
@@ -135,7 +135,7 @@ spec:
     spec:
       containers:
         - name: mariadb
-          image: mariadb:latest
+          image: mariadb:10.6.0 # use latest after TiDB support utf8mb3
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - mountPath: "/var/lib/mysql"
@@ -155,7 +155,7 @@ spec:
         name: mariadb
       spec:
         accessModes:
-        - ReadWriteOnce
+          - ReadWriteOnce
         resources:
           requests:
             storage: 5Gi