Commit 0c53791a authored by Petr Pudlak's avatar Petr Pudlak

Merge branch 'stable-2.10' into stable-2.11

* stable-2.10
  Adapt relative path expansion in PATH to new environment

* stable-2.9
  Make ganeti-cleaner switch to a save working directory
Signed-off-by: default avatarPetr Pudlak <pudlak@google.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parents 84234ff6 c6199a4d
......@@ -113,6 +113,9 @@ exec >>$LOG_FILE 2>&1
echo "Cleaner started at $(date)"
# Switch to a working directory accessible to the cleaner
cd $CLEANER_LOG_DIR
# Remove old cleaner log files
find $CLEANER_LOG_DIR -maxdepth 1 -type f | sort | head -n -$KEEP_LOGS | \
xargs -r rm -vf
......
......@@ -24,7 +24,12 @@ set -o pipefail
export PYTHON=${PYTHON:=python}
GNTC=daemons/ganeti-cleaner
CCE=tools/check-cert-expired
CCE=$PWD/tools/check-cert-expired
# Expand relative PYTHONPATH passed as passed by the test environment.
if [ "x$PYTHONPATH" = "x.:./test/py" ]
then export PYTHONPATH=$PWD:$PWD/test/py
fi
err() {
echo "$@"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment