From 62fdcbeaa5db9c2413a61f5f9a82d36835cb70bb Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 27 Oct 2014 14:05:44 +0100 Subject: controller: better connect with other utilities * controller/bin/dtf-controller.in (subcommand): Generate stdout and stderr files separately. (child_task): Generate '*.err' and '*.out' logs for subcommands. Call dtf-run-remote with --distro/--distro-version options. Call the dtf-result-stats finally and save its output to results.html. (main): Simple debugging info and comment adjusting. * controller/libexec/dtf-commit-results.in: Tak three arguments now. * controller/libexec/dtf-result-stats.in: Better read the 'tester/run' output. * controller/share/dtf-controller/ansible/playbooks/fedora.yml: Run the 'run --force' instead of 'run' on remote host. * controller/share/dtf-controller/results-stats-templates/html.tmpl React on exit_status 2. --- controller/libexec/dtf-commit-results.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'controller/libexec/dtf-commit-results.in') diff --git a/controller/libexec/dtf-commit-results.in b/controller/libexec/dtf-commit-results.in index 6b33022..b1d5bf2 100644 --- a/controller/libexec/dtf-commit-results.in +++ b/controller/libexec/dtf-commit-results.in @@ -1,12 +1,15 @@ #!/bin/bash +## $ dtf-commit-results RESULTS SUBDIR [ DB ] + . "@sysconfdir@/dtf.sh" || exit 1 # argparse resultdir="$1" +subresultdir="$2" db="$DTF_DATABASE_DEFAULT" -test -n "$2" && db="$2" +test -n "$3" && db="$3" if test -z "$db" \ || test -z "$resultdir" \ @@ -16,4 +19,6 @@ then exit 1 fi -( cd "$resultdir" && tar -xf dtf.tar.gz && cp -r . "$db" ) +mkdir -p "$db/$subresultdir" || exit 1 + +( cd "$resultdir" && tar -xf dtf.tar.gz && cp -r . "$db/$subresultdir" ) -- cgit