From b24574c8c1c9b986cf6ae1e77a7696acd557348a Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 5 Dec 2015 13:14:16 -0800 Subject: [PATCH] check-compose: set base URL for compose check reports --- inventory/group_vars/openqa | 1 + inventory/group_vars/openqa-stg | 2 ++ roles/check-compose/tasks/main.yml | 7 +++++++ roles/check-compose/templates/check-compose.conf.j2 | 6 ++++++ 4 files changed, 16 insertions(+) diff --git a/inventory/group_vars/openqa b/inventory/group_vars/openqa index 873ee96a32..25b9c9929a 100644 --- a/inventory/group_vars/openqa +++ b/inventory/group_vars/openqa @@ -20,6 +20,7 @@ wikitcms_password: "{{ prod_wikitcms_password }}" checkcompose_emailfrom: rawhide@fedoraproject.org checkcompose_emailto: "test@lists.fedoraproject.org devel@lists.fedoraproject.org" checkcompose_smtp: bastion.phx2.fedoraproject.org +checkcompose_url: "https://openqa.fedoraproject.org" deployment_type: prod diff --git a/inventory/group_vars/openqa-stg b/inventory/group_vars/openqa-stg index 4ae07daff6..5958829a84 100644 --- a/inventory/group_vars/openqa-stg +++ b/inventory/group_vars/openqa-stg @@ -32,6 +32,8 @@ wikitcms_password: "{{ stg_wikitcms_password }}" # For now let's not run any scheduled jobs on stg openqa_triggers: [] +checkcompose_url: "https://openqa.stg.fedoraproject.org" + deployment_type: stg # http and NFS diff --git a/roles/check-compose/tasks/main.yml b/roles/check-compose/tasks/main.yml index b12a56e43b..8534a8c192 100644 --- a/roles/check-compose/tasks/main.yml +++ b/roles/check-compose/tasks/main.yml @@ -1,4 +1,11 @@ # Optional vars +# - checkcompose_server +## string - hostname of openQA server to connect to (if not set, openQA +## client configuration will determine this, default will be +## localhost) +# - checkcompose_url +## string - base URL for openQA result links (if not set, will be +## the URL the client actually wound up connecting to) # - checkcompose_wait ## string - (digits) time in minutes to wait for openQA tests to complete ## before sending the report (defaults to 480) diff --git a/roles/check-compose/templates/check-compose.conf.j2 b/roles/check-compose/templates/check-compose.conf.j2 index 9a68c79379..dc4e3f649e 100644 --- a/roles/check-compose/templates/check-compose.conf.j2 +++ b/roles/check-compose/templates/check-compose.conf.j2 @@ -1,4 +1,10 @@ [main] +{% if checkcompose_server is defined %} +server: {{ checkcompose_server }} +{% endif %} +{% if checkcompose_url is defined %} +url: {{ checkcompose_url }} +{% endif %} {% if checkcompose_wait is defined %} wait: {{ checkcompose_wait }} {% endif %}