|
Solved the buildbot failure by an ugly workaround:
#-------------------------------------------------------------------------------
|
@@ -1921,9 +2029,10 @@
|
command=["runvm", "--base-image=/kvm/vms/"+kvm_image+"-upgrade2.qcow2"] + args + ["--logfile=kernel_"+port+".log", "vm-tmp-"+port+".qcow2",
|
"rm -Rf buildbot && mkdir buildbot",
|
"= scp -r -P "+port+" "+kvm_scpopt+" debs buildbot@localhost:buildbot/",
|
- "sudo rm -rf /tmp/VERSION",
|
+ "sudo rm -rf /tmp/VERSION /tmp/MAYBE_SERVER_CORE",
|
WithProperties("sh -c \"echo '%(branch)s' | sed -e \\\"s/.*\\\\(5\\\\.[1-356]\\\\|10\\\\.0\\\\).*/\\\\1/\\\"\" > /tmp/VERSION"),
|
WithProperties("case '%(branch)s' in *galera* | *5.5-hf* | 10.1) sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943
|
db ; sudo sh -c \"echo 'deb http://mirror2.hs-esslingen.de/mariadb/repo/$(cat /tmp/VERSION)/"+distro_name+" "+version_name+" main' > /etc/apt/sources.li
|
st.d/galera-test-repo.list\" ;; esac"),
|
+ "touch /tmp/MAYBE_SERVER_CORE; case $(cat /tmp/VERSION)-"+version_name+" in 10.0-trusty) echo mariadb-server-core-$(cat /tmp/VERSION) > /tmp/MAY
|
BE_SERVER_CORE ;; esac",
|
WithProperties("""
|
set -ex
|
cd buildbot
|
@@ -1932,7 +2041,7 @@
|
mysql -uroot -prootpass -e "use mytest; set global innodb_file_per_table=0; drop table if exists upgrade_test; create table upgrade_test (pk int primar
|
y key auto_increment, c char(64), v varchar(2048), d date, t time, dt datetime, ts timestamp) engine=InnoDB; begin; insert into upgrade_test values (nul
|
l, 'test', 'test', date(now()), time(now()), now(), now()); insert into upgrade_test select null, 'test', 'test', date(now()), time(now()), now(), now(
|
) from upgrade_test; insert into upgrade_test select null, 'test', 'test', date(now()), time(now()), now(), now() from upgrade_test; insert into upgrade
|
_test select null, 'test', 'test', date(now()), time(now()), now(), now() from upgrade_test; insert into upgrade_test select null, 'test', 'test', date(
|
now()), time(now()), now(), now() from upgrade_test; insert into upgrade_test select null, 'test', 'test', date(now()), time(now()), now(), now() from u
|
pgrade_test; insert into upgrade_test select null, 'test', 'test', date(now()), time(now()), now(), now() from upgrade_test; insert into upgrade_test se
|
lect null, 'test', 'test', date(now()), time(now()), now(), now() from upgrade_test; insert into upgrade_test select null, 'test', 'test', date(now()),
|
time(now()), now(), now() from upgrade_test; insert into upgrade_test select null, 'test', 'test', date(now()), time(now()), now(), now() from upgrade_t
|
est; insert into upgrade_test select null, 'test', 'test', date(now()), time(now()), now(), now() from upgrade_test; insert into upgrade_test select nul
|
l, 'test', 'test', date(now()), time(now()), now(), now() from upgrade_test; insert into upgrade_test select null, 'test', 'test', date(now()), time(now
|
()), now(), now() from upgrade_test; commit" --force
|
VER=$(echo '%(branch)s' | sed -e "s/.*\\\\(5\\\\.[1-356]\\\\|10\\\\.0\\\\).*/\\\\1/")
|
GALERA=`case '%(branch)s' in *galera* | *5.5-hf*) echo galera- ;; esac`
|
-sudo sh -c "DEBIAN_FRONTEND=noninteractive MYSQLD_STARTUP_TIMEOUT=180 apt-get install --allow-unauthenticated -y mariadb-${GALERA}server mariadb-${GALE
|
RA}server-${VER} mariadb-${GALERA}test libmariadbclient-dev mysql-common"
|
+sudo sh -c "DEBIAN_FRONTEND=noninteractive MYSQLD_STARTUP_TIMEOUT=180 apt-get install --allow-unauthenticated -y mariadb-${GALERA}server mariadb-${GALE
|
RA}server-${VER} mariadb-${GALERA}test libmariadbclient-dev mysql-common $(cat /tmp/MAYBE_SERVER_CORE)"
|
mysql -uroot -prootpass -e "use mytest; select * from t; select count(*) from upgrade_test"
|
"""),
|
"! rm -f daemon.log; (sudo cat /var/log/daemon.log || sudo cat /var/log/syslog) >daemon.log",
|
The root cause, however, remains (MDEV-5977).
|