Add 10.10 and remove mysql command
For some reason, 10.3 MDBF version does not come with mariadb commands, thus disabling it.
This commit is contained in:
		
							parent
							
								
									acb31fb98c
								
							
						
					
					
						commit
						5c512ae308
					
				|  | @ -60,26 +60,27 @@ jobs: | ||||||
|         playbook: |         playbook: | ||||||
|           - converge-mdbf.yml |           - converge-mdbf.yml | ||||||
|         mariadb-version: |         mariadb-version: | ||||||
|           - 10.3 |           - "10.3" | ||||||
|           - 10.4 |           - "10.4" | ||||||
|           - 10.5 |           - "10.5" | ||||||
|           - 10.6 |           - "10.6" | ||||||
|           - 10.7 |           - "10.7" | ||||||
|           - 10.8 |           - "10.8" | ||||||
|           - 10.9 |           - "10.9" | ||||||
|  |           - "10.10" | ||||||
|         exclude: |         exclude: | ||||||
|  |           - distro: ubuntu-18.04 | ||||||
|  |             mariadb-version: 10.3 | ||||||
|  |           - distro: ubuntu-20.04 | ||||||
|  |             mariadb-version: 10.3 | ||||||
|           - distro: ubuntu-22.04 |           - distro: ubuntu-22.04 | ||||||
|             mariadb-version: 10.3 |             mariadb-version: 10.3 | ||||||
|           - distro: ubuntu-22.04 |           - distro: ubuntu-22.04 | ||||||
|             mariadb-version: 10.4 |             mariadb-version: 10.4 | ||||||
|           - distro: ubuntu-22.04 |           - distro: ubuntu-22.04 | ||||||
|             mariadb-version: 10.5 |             mariadb-version: 10.5 | ||||||
|           # //TEMP remove below for next release |           - distro: debian-10 | ||||||
|           - distro: ubuntu-22.04 |             mariadb-version: 10.3 | ||||||
|             mariadb-version: 10.6 |  | ||||||
|           - distro: ubuntu-22.04 |  | ||||||
|             mariadb-version: 10.7 |  | ||||||
|           # //TEMP remove above for next release |  | ||||||
|           - distro: debian-11 |           - distro: debian-11 | ||||||
|             mariadb-version: 10.3 |             mariadb-version: 10.3 | ||||||
|           - distro: debian-11 |           - distro: debian-11 | ||||||
|  | @ -98,6 +99,8 @@ jobs: | ||||||
|             mariadb-version: 10.8 |             mariadb-version: 10.8 | ||||||
|           - distro: debian-sid |           - distro: debian-sid | ||||||
|             mariadb-version: 10.9 |             mariadb-version: 10.9 | ||||||
|  |           - distro: debian-sid | ||||||
|  |             mariadb-version: 10.10 | ||||||
| 
 | 
 | ||||||
|     steps: |     steps: | ||||||
|       - uses: actions/checkout@v3 |       - uses: actions/checkout@v3 | ||||||
|  |  | ||||||
|  | @ -37,34 +37,34 @@ def test_ensure_custom_config_is_applied(host): | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| def test_ensure_innodb_is_enabled(host): | def test_ensure_innodb_is_enabled(host): | ||||||
|     assert host.run("mysql -Bse 'SHOW ENGINES' |\ |     assert host.run("mariadb -Bse 'SHOW ENGINES' |\ | ||||||
|             grep -qE '^InnoDB.DEFAULT.*YES.YES.YES$'").rc == 0 |             grep -qE '^InnoDB.DEFAULT.*YES.YES.YES$'").rc == 0 | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| def test_ensure_system_db_exist(host): | def test_ensure_system_db_exist(host): | ||||||
|     assert host.run("mysql -Bse 'SHOW DATABASES' |\ |     assert host.run("mariadb -Bse 'SHOW DATABASES' |\ | ||||||
|             grep -q '^mysql$'").rc == 0 |             grep -q '^mysql$'").rc == 0 | ||||||
|     assert host.run("mysql -Bse 'SHOW DATABASES' |\ |     assert host.run("mariadb -Bse 'SHOW DATABASES' |\ | ||||||
|             grep -q '^information_schema$'").rc == 0 |             grep -q '^information_schema$'").rc == 0 | ||||||
|     assert host.run("mysql -Bse 'SHOW DATABASES' |\ |     assert host.run("mariadb -Bse 'SHOW DATABASES' |\ | ||||||
|             grep -q '^performance_schema$'").rc == 0 |             grep -q '^performance_schema$'").rc == 0 | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| def test_ensure_test_db_exist(host): | def test_ensure_test_db_exist(host): | ||||||
|     assert host.run("mysql -Bse 'SHOW DATABASES' |\ |     assert host.run("mariadb -Bse 'SHOW DATABASES' |\ | ||||||
|             grep -q '^db1'").rc == 0 |             grep -q '^db1'").rc == 0 | ||||||
|     assert host.run("mysql -Bse 'SHOW DATABASES' |\ |     assert host.run("mariadb -Bse 'SHOW DATABASES' |\ | ||||||
|             grep -q '^db2'").rc == 0 |             grep -q '^db2'").rc == 0 | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| def test_some_sql_queries(host): | def test_some_sql_queries(host): | ||||||
|     assert host.run("mysql -e 'CREATE DATABASE db'").rc == 0 |     assert host.run("mariadb -e 'CREATE DATABASE db'").rc == 0 | ||||||
|     assert host.run("mysql -e 'CREATE TABLE\ |     assert host.run("mariadb -e 'CREATE TABLE\ | ||||||
|             db.t_innodb(a1 SERIAL, c1 CHAR(8)) ENGINE=InnoDB;\ |             db.t_innodb(a1 SERIAL, c1 CHAR(8)) ENGINE=InnoDB;\ | ||||||
|             INSERT INTO db.t_innodb VALUES (1,\"foo\"),(2,\"bar\")'").rc == 0 |             INSERT INTO db.t_innodb VALUES (1,\"foo\"),(2,\"bar\")'").rc == 0 | ||||||
|     assert host.run("mysql -e 'CREATE FUNCTION db.f()\ |     assert host.run("mariadb -e 'CREATE FUNCTION db.f()\ | ||||||
|             RETURNS INT DETERMINISTIC RETURN 1'").rc == 0 |             RETURNS INT DETERMINISTIC RETURN 1'").rc == 0 | ||||||
|     assert host.run("mysql -e 'SHOW TABLES IN db'").rc == 0 |     assert host.run("mariadb -e 'SHOW TABLES IN db'").rc == 0 | ||||||
|     assert host.run("mysql -e 'SELECT * FROM db.t_innodb;\ |     assert host.run("mariadb -e 'SELECT * FROM db.t_innodb;\ | ||||||
|             INSERT INTO db.t_innodb VALUES (3,\"foo\"),(4,\"bar\")'").rc == 0 |             INSERT INTO db.t_innodb VALUES (3,\"foo\"),(4,\"bar\")'").rc == 0 | ||||||
|     assert host.run("mysql -e 'SELECT db.f()'").rc == 0 |     assert host.run("mariadb -e 'SELECT db.f()'").rc == 0 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue