From 9af130d93127fb2b3f8109ff764c27bef9905bd1 Mon Sep 17 00:00:00 2001 From: Shlomi Noach Date: Wed, 5 Feb 2020 09:46:35 +0200 Subject: [PATCH 1/9] Replication tests on 8.0 --- script/cibuild-gh-ost-replica-tests | 3 +++ 1 file changed, 3 insertions(+) diff --git a/script/cibuild-gh-ost-replica-tests b/script/cibuild-gh-ost-replica-tests index ab8c689..447e5e0 100755 --- a/script/cibuild-gh-ost-replica-tests +++ b/script/cibuild-gh-ost-replica-tests @@ -61,6 +61,9 @@ test_mysql_version() { echo "Building..." . script/build # Test all versions: +find gh-ost-ci-env/mysql-tarballs/ -name "*.tar.gz" | while read f ; do basename $f ".tar.gz" ; done | sort -r | while read mysql_version ; do + echo "found MySQL version: $mysql_version" +done find gh-ost-ci-env/mysql-tarballs/ -name "*.tar.gz" | while read f ; do basename $f ".tar.gz" ; done | sort -r | while read mysql_version ; do test_mysql_version "$mysql_version" done From 14674274dc9858ef8fa027db4fd366aacd613c0d Mon Sep 17 00:00:00 2001 From: Shlomi Noach Date: Wed, 5 Feb 2020 09:48:55 +0200 Subject: [PATCH 2/9] Experiment with https://github.com/github/gh-ost-ci-env/pull/8 --- script/cibuild-gh-ost-replica-tests | 1 + 1 file changed, 1 insertion(+) diff --git a/script/cibuild-gh-ost-replica-tests b/script/cibuild-gh-ost-replica-tests index 447e5e0..942e95a 100755 --- a/script/cibuild-gh-ost-replica-tests +++ b/script/cibuild-gh-ost-replica-tests @@ -16,6 +16,7 @@ echo "local commit is: $local_commit" if [ "$remote_commit" != "$local_commit" ] ; then rm -rf ./gh-ost-ci-env git clone https://github.com/github/gh-ost-ci-env.git + git checkout real-tar-gz fi test_mysql_version() { From 919647cbbc32a7ec5514d64396cbb9349694d35a Mon Sep 17 00:00:00 2001 From: Shlomi Noach Date: Wed, 5 Feb 2020 09:50:34 +0200 Subject: [PATCH 3/9] removing travis --- .travis.yml | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c1c1891..0000000 --- a/.travis.yml +++ /dev/null @@ -1,33 +0,0 @@ -# http://docs.travis-ci.com/user/languages/go/ -language: go - -go: - - "1.12.x" - -os: - - linux - -services: - - mysql - -env: -- MYSQL_USER=root -- CURRENT_CI_ENV=travis - -addons: - apt: - packages: - - git - - numactl - - libaio1 - -before_install: - - mysql -e 'CREATE DATABASE IF NOT EXISTS test;' - -install: true - -script: - - script/cibuild - -notifications: - email: false From 3528d675502f2c1cefd4cee1f6caa77042faf21d Mon Sep 17 00:00:00 2001 From: Shlomi Noach Date: Wed, 5 Feb 2020 09:51:40 +0200 Subject: [PATCH 4/9] fetch the correct branch. Oh and removing travis --- script/cibuild-gh-ost-replica-tests | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/cibuild-gh-ost-replica-tests b/script/cibuild-gh-ost-replica-tests index 942e95a..c0b53d9 100755 --- a/script/cibuild-gh-ost-replica-tests +++ b/script/cibuild-gh-ost-replica-tests @@ -6,7 +6,7 @@ whoami # Clone gh-ost-ci-env # Only clone if not already running locally at latest commit -remote_commit=$(git ls-remote https://github.com/github/gh-ost-ci-env.git HEAD | cut -f1) +remote_commit=$(git ls-remote https://github.com/github/gh-ost-ci-env.git real-tar-gz | cut -f1) local_commit="unknown" [ -d "gh-ost-ci-env" ] && local_commit=$(cd gh-ost-ci-env && git log --format="%H" -n 1) @@ -16,6 +16,7 @@ echo "local commit is: $local_commit" if [ "$remote_commit" != "$local_commit" ] ; then rm -rf ./gh-ost-ci-env git clone https://github.com/github/gh-ost-ci-env.git + git fetch origin real-tar-gz git checkout real-tar-gz fi From 9201b9bc04b41dbfadd9da7406dd3549f3fe4ad7 Mon Sep 17 00:00:00 2001 From: Shlomi Noach Date: Wed, 5 Feb 2020 09:54:07 +0200 Subject: [PATCH 5/9] fetch and checkout from git path --- script/cibuild-gh-ost-replica-tests | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/script/cibuild-gh-ost-replica-tests b/script/cibuild-gh-ost-replica-tests index c0b53d9..813fdd8 100755 --- a/script/cibuild-gh-ost-replica-tests +++ b/script/cibuild-gh-ost-replica-tests @@ -16,8 +16,11 @@ echo "local commit is: $local_commit" if [ "$remote_commit" != "$local_commit" ] ; then rm -rf ./gh-ost-ci-env git clone https://github.com/github/gh-ost-ci-env.git - git fetch origin real-tar-gz - git checkout real-tar-gz + ( + cd gh-ost-ci-env + git fetch origin real-tar-gz + git checkout real-tar-gz + ) fi test_mysql_version() { From b0f487ea613445c6d5a444b9176b3e93e333d7ea Mon Sep 17 00:00:00 2001 From: Shlomi Noach Date: Wed, 5 Feb 2020 10:07:14 +0200 Subject: [PATCH 6/9] create user --- script/cibuild-gh-ost-replica-tests | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/cibuild-gh-ost-replica-tests b/script/cibuild-gh-ost-replica-tests index 813fdd8..c0c925c 100755 --- a/script/cibuild-gh-ost-replica-tests +++ b/script/cibuild-gh-ost-replica-tests @@ -55,7 +55,8 @@ test_mysql_version() { export PATH="${PWD}/gh-ost-ci-env/bin/:${PATH}" - gh-ost-test-mysql-master -uroot -e "grant all on *.* to 'gh-ost'@'%' identified by 'gh-ost'" + gh-ost-test-mysql-master -uroot -e "create user 'gh-ost'@'%' identified by 'gh-ost'" + gh-ost-test-mysql-master -uroot -e "grant all on *.* to 'gh-ost'@'%'" echo "### Running gh-ost tests for $mysql_version" ./localtests/test.sh -b bin/gh-ost From a6d0d5ca26fa9291721afc73f61792933e9565d7 Mon Sep 17 00:00:00 2001 From: Shlomi Noach Date: Wed, 5 Feb 2020 10:12:29 +0200 Subject: [PATCH 7/9] not null for unique key test --- localtests/swap-uk-uk/create.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/localtests/swap-uk-uk/create.sql b/localtests/swap-uk-uk/create.sql index 5fcbf32..30c1542 100644 --- a/localtests/swap-uk-uk/create.sql +++ b/localtests/swap-uk-uk/create.sql @@ -1,8 +1,8 @@ drop table if exists gh_ost_test; create table gh_ost_test ( - id bigint, + id bigint not null, i int not null, - ts timestamp(6), + ts timestamp(6) not null, unique key id_uidx(id), unique key its_uidx(i, ts) ) ; From 4f827a271e5094a3b59c195dd9e4af54a1fb857d Mon Sep 17 00:00:00 2001 From: Shlomi Noach Date: Wed, 5 Feb 2020 10:42:36 +0200 Subject: [PATCH 8/9] 8.0 is on master now --- script/cibuild-gh-ost-replica-tests | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/script/cibuild-gh-ost-replica-tests b/script/cibuild-gh-ost-replica-tests index c0c925c..8b518e1 100755 --- a/script/cibuild-gh-ost-replica-tests +++ b/script/cibuild-gh-ost-replica-tests @@ -6,7 +6,7 @@ whoami # Clone gh-ost-ci-env # Only clone if not already running locally at latest commit -remote_commit=$(git ls-remote https://github.com/github/gh-ost-ci-env.git real-tar-gz | cut -f1) +remote_commit=$(git ls-remote https://github.com/github/gh-ost-ci-env.git | cut -f1) local_commit="unknown" [ -d "gh-ost-ci-env" ] && local_commit=$(cd gh-ost-ci-env && git log --format="%H" -n 1) @@ -16,11 +16,6 @@ echo "local commit is: $local_commit" if [ "$remote_commit" != "$local_commit" ] ; then rm -rf ./gh-ost-ci-env git clone https://github.com/github/gh-ost-ci-env.git - ( - cd gh-ost-ci-env - git fetch origin real-tar-gz - git checkout real-tar-gz - ) fi test_mysql_version() { From c30e5862f7b46170c1a8d444b7439e02bd16a752 Mon Sep 17 00:00:00 2001 From: Shlomi Noach Date: Wed, 5 Feb 2020 10:43:08 +0200 Subject: [PATCH 9/9] 8.0 is on master now --- script/cibuild-gh-ost-replica-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/cibuild-gh-ost-replica-tests b/script/cibuild-gh-ost-replica-tests index 8b518e1..3de9e05 100755 --- a/script/cibuild-gh-ost-replica-tests +++ b/script/cibuild-gh-ost-replica-tests @@ -6,7 +6,7 @@ whoami # Clone gh-ost-ci-env # Only clone if not already running locally at latest commit -remote_commit=$(git ls-remote https://github.com/github/gh-ost-ci-env.git | cut -f1) +remote_commit=$(git ls-remote https://github.com/github/gh-ost-ci-env.git HEAD | cut -f1) local_commit="unknown" [ -d "gh-ost-ci-env" ] && local_commit=$(cd gh-ost-ci-env && git log --format="%H" -n 1)