#At bzr+ssh://bk-internal.mysql.com/bzrroot/mysql-falcon/ based on revid:hky@stripped
302 Hakan Kuecuekyilmaz 2008-11-20
Brought wrapper script for iuds6.tst up to date.
Removed copy of local.env with placeholders (don't duplicate data, d'oh!).
removed:
system-qa/local.env
modified:
system-qa/bzr_pull_and_prepare_system-qa.sh
=== modified file 'system-qa/bzr_pull_and_prepare_system-qa.sh'
--- a/system-qa/bzr_pull_and_prepare_system-qa.sh 2008-07-16 15:06:40 +0000
+++ b/system-qa/bzr_pull_and_prepare_system-qa.sh 2008-11-20 12:40:39 +0000
@@ -40,28 +40,44 @@ USER_NAME='hakank'
#
# Directories.
#
-WORK='/data0/falcon-system-qa'
+WORK='/data0/system-qa'
-# FALCON='mysql-6.0'
+#FALCON='mysql-6.0'
FALCON='mysql-6.0-falcon'
#FALCON='mysql-6.0-falcon-team'
+
SYSTEM_QA='mysql-test-extra-6.0'
-FALCON_BZR_ROOT="bzr+ssh://$USER_NAME@stripped/bzrroot/server"
-SYSTEM_QA_BK_ROOT="$USER_NAME@stripped:/home/bk/$SYSTEM_QA"
+FALCON_BZR_ROOT="bzr+ssh://${USER_NAME}@bk-internal.mysql.com/bzrroot/server"
+SYSTEM_QA_BZR_ROOT="bzr+ssh://${USER_NAME}@bk-internal.mysql.com/bzrroot/server/${SYSTEM_QA}"
-FALCON_LOCAL_MASTER="$WORK/$FALCON-local-master"
-SYSTEM_QA_LOCAL_MASTER="$WORK/$SYSTEM_QA-local-master"
+FALCON_LOCAL_MASTER="${WORK}/${FALCON}-local-master"
+SYSTEM_QA_LOCAL_MASTER="${WORK}/$SYSTEM_QA-local-master"
-FALCON_WORK="$WORK/$FALCON"
-SYSTEM_QA_BASE="$WORK/mysql-test-extra-6.0"
+FALCON_WORK="${WORK}/${FALCON}"
+SYSTEM_QA_BASE="${WORK}/mysql-test-extra-6.0"
SYSTEM_QA_WORK='/data0/system-qa/systest'
+CURRENT_BUILD='cb'
+
#
# Files.
#
-LOG="$WORK/weekly_falcon_system-qa.txt"
-LOCAL_ENV="$HOME/work/mysql-falcon/system-qa/local.env"
+LOG="${WORK}/weekly_falcon_system-qa.log"
+MAKE_LOG="${WORK}/weekly_falcon_system-qa_make.log"
+LOCAL_ENV="${SYSTEM_QA_BASE}/mysql-test/qa-suite/systems/local.env"
+
+#
+# Variables to make replacements in local.env configuration file.
+# Notes:
+# ** The following variables have to match the ones in $LOCAL_ENV.
+# ** The single quotes are on purpose!
+#
+MYSQL_BASEDIR='/home/omer/mysql/bin_6005'
+MYSQL_BINDIR='$MYSQL_BASEDIR/bin'
+MYSQL_BINDIR_NEW='$MYSQL_BASEDIR/client'
+STRESS_TEST_BASEDIR='/home/omer/my_bzr/extra60'
+STRESS_TEST_WORKDIR='/tmp/systest'
# Note: Removed --with-ndbcluster, --with-embedded-server
COMMON_CONFIG="
@@ -97,7 +113,7 @@ DEBUG_CONFIG="$COMMON_CONFIG \
--with-server-suffix='-debug' \
--with-comment='MySQL-Community-Server-Debug' \
--with-debug \
- --without-ndb-debug "
+ --without-ndb-debug"
#
# Control date.
@@ -106,118 +122,158 @@ TIMESTAMP=$(date +%Y-%m-%d)
echo "[INFO] Starting Weekly Falcon system-qa Overview - $TIMESTAMP" > $LOG
-# Delete old copies and work directories.
+# Delete old copies and work directories and re-create needed ones.
rm -rf $FALCON_WORK
rm -rf $SYSTEM_QA_BASE
rm -rf $SYSTEM_QA_WORK
-rm -rf $WORK/current_build
+rm -rf ${WORK}/${CURRENT_BUILD}
+
mkdir $SYSTEM_QA_WORK
-mkdir $WORK/current_build
+mkdir ${WORK}/${CURRENT_BUILD}
# Get new working copy.
if [ ! -d $FALCON_LOCAL_MASTER ]; then
- bzr branch $FALCON_BZR_ROOT $FALCON_LOCAL_MASTER >> $LOG 2>&1
+ bzr branch ${FALCON_BZR_ROOT}/${FALCON} $FALCON_LOCAL_MASTER >> $LOG 2>&1
fi
if [ $? != 0 ]; then
- echo "Branch of $FALCON_BZR_ROOT failed" >> $LOG
+ echo "[ERROR]: Branch of ${FALCON_BZR_ROOT}/${FALCON} failed" >> $LOG
exit 1
fi
cd $FALCON_LOCAL_MASTER
bzr pull >> $LOG 2>&1
if [ $? != 0 ]; then
- echo "Pull of $FALCON_LOCAL_MASTER failed" >> $LOG
+ echo "[ERROR]: Pull of $FALCON_LOCAL_MASTER failed" >> $LOG
exit 1
fi
if [ ! -d $SYSTEM_QA_LOCAL_MASTER ]; then
- bzr branch $SYSTEM_QA_BK_ROOT $SYSTEM_QA_LOCAL_MASTER >> $LOG 2>&1
+ bzr branch $SYSTEM_QA_BZR_ROOT $SYSTEM_QA_LOCAL_MASTER >> $LOG 2>&1
fi
if [ $? != 0 ]; then
- echo "Branch of $SYSTEM_QA_LOCAL_MASTER failed" >> $LOG
+ echo "[ERROR]: Branch of $SYSTEM_QA_LOCAL_MASTER failed" >> $LOG
exit 1
fi
cd $SYSTEM_QA_LOCAL_MASTER
bzr pull >> $LOG 2>&1
if [ $? != 0 ]; then
- echo "Pull of $SYSTEM_QA_LOCAL_MASTER failed" >> $LOG
+ echo "[ERROR]: Pull of $SYSTEM_QA_LOCAL_MASTER failed" >> $LOG
exit 1
fi
bzr branch $FALCON_LOCAL_MASTER $FALCON_WORK >> $LOG 2>&1
# Was the branch successful?
if [ $? != 0 ]; then
- echo "Branching of $FALCON_WORK failed." >> $LOG
+ echo "[ERROR]: Branching of $FALCON_WORK failed." >> $LOG
exit 1
fi
bzr branch $SYSTEM_QA_LOCAL_MASTER $SYSTEM_QA_BASE >> $LOG 2>&1
if [ $? != 0 ]; then
- echo "Branching of $SYSTEM_QA_BASE failed." >> $LOG
+ echo "[ERROR]: Branching of $SYSTEM_QA_BASE failed." >> $LOG
exit 1
fi
# Prepare source.
cd $FALCON_WORK
apply_patches >> $LOG 2>&1
-BUILD/compile-dist >> $LOG 2>&1
+BUILD/compile-dist > $MAKE_LOG 2>&1
if [ $? != 0 ]; then
- echo 'BUILD/compile-dist failed!' >> $LOG 2>&1
+ echo '[ERROR]: BUILD/compile-dist failed!' >> $LOG
exit 1
else
- echo 'BUILD/compile-dist was successful!' >> $LOG 2>&1
+ echo '[INFO]: BUILD/compile-dist was successful!' >> $LOG
fi
-make dist >> $LOG 2>&1
+make dist >> $MAKE_LOG 2>&1
if [ $? != 0 ]; then
- echo 'make dist failed!' >> $LOG 2>&1
+ echo '[ERROR]: make dist failed!' >> $LOG
exit 1
else
- echo 'make dist was successful!' >> $LOG 2>&1
+ echo '[INFO]: make dist was successful!' >> $LOG
fi
-ARCHIVE=$(basename $FALCON_WORK/*.tar.gz)
-ARCHIVE_DIR=$WORK/current_build/$(echo $ARCHIVE | awk -F '.tar.gz' '{ print $1 }')
+ARCHIVE=$(basename ${FALCON_WORK}/*.tar.gz)
+ARCHIVE_DIR=${WORK}/${CURRENT_BUILD}/$(echo $ARCHIVE | awk -F '.tar.gz' '{ print $1 }')
-cd $WORK/current_build
-gunzip -c $FALCON_WORK/$ARCHIVE | tar xf -
+cd ${WORK}/${CURRENT_BUILD}
+gunzip -c ${FALCON_WORK}/${ARCHIVE} | tar xf -
cd $ARCHIVE_DIR
if [ $BUILD_TYPE = "opt" ]; then
- ./configure $RELEASE_CONFIG
+ ./configure $RELEASE_CONFIG >> $MAKE_LOG 2>&1
else
- ./configure $DEBUG_CONFIG
+ ./configure $DEBUG_CONFIG >> $MAKE_LOG 2>&1
fi
if [ $? != 0 ]; then
- echo 'configure failed!' >> $LOG 2>&1
+ echo '[ERROR]: configure failed!' >> $LOG
exit 1
else
- echo 'configure was successful!' >> $LOG 2>&1
+ echo '[INFO]: configure was successful!' >> $LOG
fi
-make -j8
+make -j8 >> $MAKE_LOG 2>&1
if [ $? != 0 ]; then
- echo 'make failed!' >> $LOG 2>&1
+ echo '[ERROR]: make failed!' >> $LOG
exit 1
else
- echo 'make was successful!' >> $LOG 2>&1
+ echo '[INFO]: make was successful!' >> $LOG 2>&1
fi
# Softlink system-qa into test directory.
ln -s $SYSTEM_QA_BASE/mysql-test/qa-suite/systems $ARCHIVE_DIR/mysql-test/suite/systems
-#ln -s $SYSTEM_QA_BASE/mysql-test/qa-suite/systems $SYSTEM_QA_BASE/mysql-test/suite/systems
+if [ $? != 0 ]; then
+ echo '[ERROR]: ln -s of qa-suite/systems failed!' >> $LOG
+ exit 1
+fi
+
+#
+# Adjust configuration in local.env.
+#
+sed -e "s|$MYSQL_BASEDIR|$ARCHIVE_DIR|" $LOCAL_ENV > ${WORK}/local.tmp
+if [ $? != 0 ]; then
+ echo '[ERROR]: sed $MYSQL_BASEDIR failed!' >> $LOG
+ exit 1
+fi
+
+sed -e "s|$MYSQL_BINDIR|$MYSQL_BINDIR_NEW|" ${WORK}/local.tmp > ${WORK}/local_2.tmp
+if [ $? != 0 ]; then
+ echo '[ERROR]: sed $MYSQL_TEST failed!' >> $LOG
+ exit 1
+fi
-# Adjust configuration in local.env
-sed -e "s|%%%MYSQL_BASEDIR%%%|\'$ARCHIVE_DIR\'|" $LOCAL_ENV > $WORK/local.tmp
-sed -e "s|%%%STRESS_TEST_BASEDIR%%%|\'$SYSTEM_QA_BASE\'|" $WORK/local.tmp > $WORK/local_2.tmp
-sed -e "s|%%%STRESS_TEST_WORKDIR%%%|\'$SYSTEM_QA_WORK\'|" $WORK/local_2.tmp > $ARCHIVE_DIR/mysql-test/suite/systems/local.env
-rm -f $WORK/local.tmp
-
-# Adjust configuration in iuds6.tst
-sed -e 's/ENG1=innodb/ENG1=falcon/' $ARCHIVE_DIR/mysql-test/suite/systems/iuds6.tst > $WORK/iuds6.tmp
-sed -e 's/ENG2=innodb/ENG2=falcon/' $WORK/iuds6.tmp > $ARCHIVE_DIR/mysql-test/suite/systems/iuds6.tst
+sed -e "s|$STRESS_TEST_BASEDIR|$SYSTEM_QA_BASE|" ${WORK}/local_2.tmp > ${WORK}/local_3.tmp
+if [ $? != 0 ]; then
+ echo '[ERROR]: sed $STRESS_TEST_BASEDIR failed!' >> $LOG
+ exit 1
+fi
+
+sed -e "s|$STRESS_TEST_WORKDIR|$SYSTEM_QA_WORK|" ${WORK}/local_3.tmp > $ARCHIVE_DIR/mysql-test/suite/systems/local.env
+if [ $? != 0 ]; then
+ echo '[ERROR]: sed $STRESS_TEST_WORKDIR failed!' >> $LOG
+ exit 1
+fi
+
+rm -f ${WORK}/local.tmp
+rm -f ${WORK}/local_2.tmp
+rm -f ${WORK}/local_3.tmp
+
+#
+# Adjust configuration in iuds6.tst.
+#
+sed -e 's/ENG1=innodb/ENG1=falcon/' $ARCHIVE_DIR/mysql-test/suite/systems/iuds6.tst > ${WORK}/iuds6.tmp
+if [ $? != 0 ]; then
+ echo '[ERROR]: sed ENG1 failed!' >> $LOG
+ exit 1
+fi
+
+sed -e 's/ENG2=innodb/ENG2=falcon/' ${WORK}/iuds6.tmp > $ARCHIVE_DIR/mysql-test/suite/systems/iuds6.tst
+if [ $? != 0 ]; then
+ echo '[ERROR]: sed ENG2 failed!' >> $LOG
+ exit 1
+fi
# Todo: tests to run
# - System IUD (iuds6.tst)
=== removed file 'system-qa/local.env'
--- a/system-qa/local.env 2008-04-23 11:31:01 +0000
+++ b/system-qa/local.env 1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-###########################################################################
-#
-# Begin of configuration section
-#
-###########################################################################
-# This configuration file is used for a local run on *nix systems
-# Actual values need to be configured
-###########################################################################
-# changes:
-# 2007-04-11 OBN - Split the original confg file to test related
-# and environment related config files
-# 2008-02-12 HK - Made local copy for automated testing with Falcon.
-# Placeholders enclosed in %%% are replaced by
-# bk_pull_and_prepare_system-qa.sh
-#
-###########################################################################
-STRESS_SUITE="systems"
-
-
-MYSQL_BASEDIR=%%%MYSQL_BASEDIR%%%
-MYSQL_BINDIR="$MYSQL_BASEDIR/client" # Location of the MySQL Binaries
-
-export MYSQL_BINDIR # Used by log_cleanup.sh
-MYSQL_TEST="$MYSQL_BINDIR/mysqltest"
-STRESS_TEST_BASEDIR=%%%STRESS_TEST_BASEDIR%%%
-STRESS_TEST_WORKDIR=%%%STRESS_TEST_WORKDIR%%%
-
-WINDOWS=0 # Set to '1' for Wimdows environments
-START_SERVER_ONLY=0 # Set to '1' if running as a server with a
- # remote client
-
-#CLIENT_HOSTNAME="" # The name of the remote client machine if used
-#export CLIENT_HOSTNAME # Used by add_client_host_name() func
-
-SERVER_HOST="localhost" # Server hostname:
- # <localhost> for local connections through socket
- # <some-host-name> for remote connections
-
-SERVER_PORT="9306" # Port for remote connections
-export SERVER_PORT # Used by log_cleanup.sh
-
-MONITOR_FILE="sys_data.out" # Name of system monitor file
-
-MONITOR_INTR=10 # Sleep time between system monitoring
-CLEANUP_INTR=30 # Sleep time between log file cleanup
-
-CLEANUP=1 # Set to '0' if running as a client against
- # a remote server
-
-# Derived variables (unless changed)
-VAR_DIR="$MYSQL_BASEDIR/mysql-test/var" # If running as a client of a remote server
- # Set to the value of the VARDIR on the server
-export VAR_DIR # Used by log_cleanup.sh
-
-SERVER_SOCKET="$VAR_DIR/tmp/master.sock"
-STRESS_TEST_SUITEDIR="$STRESS_TEST_BASEDIR/mysql-test/qa-suite/$STRESS_SUITE"
-export STRESS_TEST_SUITEDIR # Need to export since used in test files
-############################################################################
| Thread |
|---|
| • bzr commit into mysql-falcon branch (hky:302) | Hakan Kuecuekyilmaz | 20 Nov |
