From bb3d1c1fe7cae7e5e2758c95ff2de751980f00c0 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 20 Dec 2016 18:52:52 -0800 Subject: [PATCH] openqa: handle 4.4-32 and 4.4-33 behaving differently --- roles/openqa/server/tasks/main.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index 2fdd0e91f3..4286435840 100644 --- a/roles/openqa/server/tasks/main.yml +++ b/roles/openqa/server/tasks/main.yml @@ -196,8 +196,12 @@ tags: - config +# we redirect stdout to stderr here to account for a difference between +# openQA <= 4.4-32 (currently in prod) and openQA >= 4.4-33 (currently in +# stg). When 4.4-33 or later is in prod, we can drop that and go back to +# command instead of shell - name: Initialize database - command: "/usr/share/openqa/script/initdb --user geekotest --init_database" + shell: "/usr/share/openqa/script/initdb --user geekotest --init_database 1>&2" register: initdb changed_when: "initdb.rc == 0" failed_when: "(initdb.rc > 0) and (initdb.stderr is not defined or initdb.stderr.find('already exists') == -1)" @@ -247,7 +251,7 @@ # the prior and following steps; when the templates actually changed, # the *following* step will register as changed. - name: Load tests - shell: "/var/lib/openqa/share/tests/fedora/templates --clean" + command: "/var/lib/openqa/share/tests/fedora/templates --clean" when: "(gittests is defined) and (gittests|changed)" changed_when: "1 != 1"