Skip to content

Commit bb7634b

Browse files
authored
Merge pull request #57590 from OddBloke/oddbloke/percona-server-9.1
percona-server-9.1: fix FTBFS, tests
2 parents 0938806 + 6a46fe9 commit bb7634b

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

percona-server-9.1.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package:
22
name: percona-server-9.1
33
version: "9.1.0.1"
4-
epoch: 2
4+
epoch: 3
55
description: "Percona Server for MySQL is a free, fully compatible, enhanced, and open source drop-in replacement for any MySQL database. It provides superior performance, scalability, and instrumentation."
66
copyright:
77
- license: GPL-3.0-or-later
88
- license: BSD-3-Clause
99
resources:
1010
cpu: 16
11-
memory: 16Gi
11+
memory: 32Gi
1212
dependencies:
1313
provides:
1414
- percona-server=${{package.full-version}}
@@ -168,17 +168,16 @@ test:
168168
runs: |
169169
# Create a non-root user for the MySQL test...
170170
adduser -D -h /home/mysql mysql
171-
chown -R mysql:mysql /var/lib/mysql /run/mysqld /var/tmp
172171
mkdir -p /run/mysqld /var/lib/mysql /var/tmp
173172
chown -R mysql:mysql /run/mysqld /var/lib/mysql /var/tmp
174173
- name: Initialize MySQL data directory
175174
runs: |
176175
su mysql -c "mysqld --initialize-insecure --datadir=/var/lib/mysql" || exit 1
177176
- name: Start MySQL server with no password validation
178177
runs: |
179-
su mysql -c "mysqld --datadir=/var/lib/mysql --socket=/run/mysqld/mysqld.sock --skip-grant-tables &"
178+
su mysql -c "mysqld --datadir=/var/lib/mysql --socket=/run/mysqld/mysqld.sock --skip-grant-tables > /tmp/percona-server.log 2>&1 &"
180179
sleep 10
181-
su mysql -c "mysqladmin ping --socket=/run/mysqld/mysqld.sock" || exit 1
180+
su mysql -c "mysqladmin ping --socket=/run/mysqld/mysqld.sock" || { cat /tmp/percona-server.log; exit 1; }
182181
- name: Create test database
183182
runs: |
184183
echo "CREATE DATABASE test_db;" | su mysql -c "mysql --socket=/run/mysqld/mysqld.sock" || exit 1

0 commit comments

Comments
 (0)