From b72ebfbbd2ca45c6d8cb2f3728f9c98a4d8c376f Mon Sep 17 00:00:00 2001 From: Shlomi Noach Date: Wed, 5 Feb 2020 10:28:54 +0200 Subject: [PATCH] replication tests CI: switch to .tar.xz binaries, upgrade dbdeployer --- script/cibuild-gh-ost-replica-tests | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/cibuild-gh-ost-replica-tests b/script/cibuild-gh-ost-replica-tests index c0c925c..af3155f 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 tar-xz-binaries | cut -f1) local_commit="unknown" [ -d "gh-ost-ci-env" ] && local_commit=$(cd gh-ost-ci-env && git log --format="%H" -n 1) @@ -18,8 +18,8 @@ if [ "$remote_commit" != "$local_commit" ] ; then 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 + git fetch origin tar-xz-binaries + git checkout tar-xz-binaries ) fi @@ -35,7 +35,7 @@ test_mysql_version() { mkdir -p sandbox/binary rm -rf sandbox/binary/* - gh-ost-ci-env/bin/linux/dbdeployer unpack gh-ost-ci-env/mysql-tarballs/"$mysql_version".tar.gz --unpack-version="$mysql_version" --sandbox-binary ${PWD}/sandbox/binary + gh-ost-ci-env/bin/linux/dbdeployer unpack gh-ost-ci-env/mysql-tarballs/"$mysql_version".tar.xz --unpack-version="$mysql_version" --sandbox-binary ${PWD}/sandbox/binary mkdir -p sandboxes rm -rf sandboxes/* @@ -67,9 +67,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 +find gh-ost-ci-env/mysql-tarballs/ -name "*.tar.xz" | while read f ; do basename $f ".tar.xz" ; 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 +find gh-ost-ci-env/mysql-tarballs/ -name "*.tar.xz" | while read f ; do basename $f ".tar.xz" ; done | sort -r | while read mysql_version ; do test_mysql_version "$mysql_version" done