make copy test reliable

wal-g · Mar 1, 2024 · 812cfc2 · 812cfc2
1 parent 33cf8cc
commit 812cfc2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/docker/mysql/export_common.sh b/docker/mysql/export_common.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 # common wal-g settings
+# export MYSQLDATA=/var/lib/mysql
 export WALG_MYSQL_DATASOURCE_NAME=sbtest:@/sbtest
 export WALG_STREAM_CREATE_COMMAND="xtrabackup --backup \
     --stream=xbstream \

diff --git a/docker/mysql_tests/scripts/base_tests/conf-only-test.sh b/docker/mysql_tests/scripts/base_tests/conf-only-test.sh
@@ -5,7 +5,7 @@ set -e -x
 
 # https://github.com/wal-g/wal-g/issues/790
 ## ensure correct conf option will overwrite this trash
-#export AWS_ENDPOINT=we23i902309239
+export AWS_ENDPOINT=we23i902309239
 
 cat > /root/conf.yaml <<EOH
 WALE_S3_PREFIX: s3://mysqlconfonly
@@ -31,8 +31,9 @@ mysqld --initialize --init-file=/etc/mysql/init.sql
 service mysql start
 mysql mysql -e 'create table testt1(i int)'
 
-export NAME
-NAME=$(wal-g backup-push --config=/root/conf.yaml 2>&1 | grep -oe 'stream_[0-9]*T[0-9]*Z' | sort -u)
+wal-g backup-push --config=/root/conf.yaml
+
+NAME=$(wal-g backup-list --config=/root/conf.yaml | grep -oe 'stream_[0-9]*T[0-9]*Z' | sort -u)
 
 mysql_kill_and_clean_data