From 8f67ed747a7ebfa1ccfb452a4e54862d7ac3ec43 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 20 Oct 2015 16:07:58 +0200 Subject: generate-data: fixes needed for docker Because we usually mount /var/lib/pgsql/data into container, scripts would fail on 'rm -rf /var/lib/pgsql/data'. * generate (GEN_DATA): Use $PGHOME/data/data. (single_task): Generate tarball from proper datadir. * prep: Use 'dnf' when necessary. Use /var/lib/pgsql/data/data directory. --- postgresql-tests/gen-data/generate | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'postgresql-tests/gen-data/generate') diff --git a/postgresql-tests/gen-data/generate b/postgresql-tests/gen-data/generate index d8ead6b..4269b9e 100755 --- a/postgresql-tests/gen-data/generate +++ b/postgresql-tests/gen-data/generate @@ -1,6 +1,6 @@ #!/bin/bash -GEN_DATADIR=/var/lib/pgsql/data +GEN_DATADIR=/var/lib/pgsql/data/data CACHEDIR=/var/cache/dbt OUTPUTDIR="$(pwd)/results" SRCDIR="$(pwd)" @@ -89,7 +89,7 @@ single_task() service postgresql stop &>/dev/null || die "can't stop postgresql" tarball="$OUTPUTDIR/$task_name.tar.gz" - tar -czf "$tarball" -C /var/lib/pgsql/ data + tar -czf "$tarball" -C /var/lib/pgsql/data data info "result tarball $tarball" rm -rf "$tmpdir" -- cgit