diff options
| author | Josef Skladanka <jskladan@redhat.com> | 2015-03-31 10:45:08 +0000 |
|---|---|---|
| committer | Martin Krizek <mkrizek@redhat.com> | 2015-03-31 10:45:08 +0000 |
| commit | dc91001f9497cc465d32e8e9d9e9e68729d65b96 (patch) | |
| tree | 162a8fa2ad97c7a24f44edf5415e85fbf990cb92 | |
| parent | 2d5d97ca502d771a14c160909ccdf4841f91208e (diff) | |
| download | ansible-dc91001f9497cc465d32e8e9d9e9e68729d65b96.tar.gz ansible-dc91001f9497cc465d32e8e9d9e9e68729d65b96.tar.xz ansible-dc91001f9497cc465d32e8e9d9e9e68729d65b96.zip | |
Symlink artefacts dir to 'all' directory to provide canonical path
| -rw-r--r-- | inventory/group_vars/resultsdb-dev | 2 | ||||
| -rw-r--r-- | roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 | 2 | ||||
| -rw-r--r-- | roles/taskotron/execdb/templates/settings.py.j2 | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/inventory/group_vars/resultsdb-dev b/inventory/group_vars/resultsdb-dev index 116548c80..82e6d9ba8 100644 --- a/inventory/group_vars/resultsdb-dev +++ b/inventory/group_vars/resultsdb-dev @@ -30,6 +30,8 @@ execdb_db_port: 5432 execdb_endpoint: 'execdb' execdb_db_name: execdb_dev +external_hostname: taskotron-dev.fedoraproject.org + allowed_hosts: - 10.5.124 diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index ac56fb75b..9accdd15d 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -199,7 +199,7 @@ def today(props): return datetime.datetime.now().strftime("%Y%m%d") # move artifacts dir -factory.addStep(MasterShellCommand(command=Interpolate('mkdir -p -m 0755 {{ public_artifacts_dir }}/%(kw:today)s && mv {{ public_artifacts_dir }}/%(prop:uuid)s/ {{ public_artifacts_dir }}/%(kw:today)s/', today=today), +factory.addStep(MasterShellCommand(command=Interpolate('mkdir -p -m 0755 {{ public_artifacts_dir }}/%(kw:today)s && mkdir -p -m 0755 {{ public_artifacts_dir }}/all && mv {{ public_artifacts_dir }}/%(prop:uuid)s/ {{ public_artifacts_dir }}/%(kw:today)s/ && ln -s {{ public_artifacts_dir }}/%(kw:today)s/%(prop:uuid)s {{ public_artifacts_dir }}/all/', today=today), descriptionDone=['Move artifacs dir'])) {% else %} # capture the taskotron log diff --git a/roles/taskotron/execdb/templates/settings.py.j2 b/roles/taskotron/execdb/templates/settings.py.j2 index 854bac94e..8cc965b2d 100644 --- a/roles/taskotron/execdb/templates/settings.py.j2 +++ b/roles/taskotron/execdb/templates/settings.py.j2 @@ -18,3 +18,7 @@ FILE_LOGGING = False LOGFILR = '/var/log/execdb/execdb.log' SYSLOG_LOGGING = False STREAM_LOGGING = True + +BUILDBOT_FRONTPAGE_URL = 'http://{{ external_hostname }}/taskmaster' +RESULTSDB_FRONTPAGE_URL = 'http://{{ external_hostname }}/resultsdb' +ARTIFACTS_BASE_URL = 'http://{{ external_hostname }}/artifacts/all' |