Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

taskotron-stg: switch over to production message bus

Browse source 
Also sync configs with dev.
This commit is contained in:
Kamil Páral 2017-08-04 17:57:51 +02:00
parent 9b7f1e9f8c
commit 0aa24161cb
3 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
inventory/group_vars/taskotron-stg
View file

@ -1,7 +1,7 @@
--- ---
############################################################ ############################################################
# general information # general information
########################################################### ############################################################
tcp_ports: [ 80, 443, "{{ buildslave_port }}" ] tcp_ports: [ 80, 443, "{{ buildslave_port }}" ]
freezes: false freezes: false
@ -10,10 +10,10 @@ external_hostname: taskotron.stg.fedoraproject.org
deployment_type: stg deployment_type: stg
robots_path: /var/www/html robots_path: /var/www/html
# this enables extra repos during dnf install but that's broken right now, remember to re-enable # this enables extra repos during dnf operations
extra_enablerepos: 'infrastructure-testing' extra_enablerepos: 'infrastructure-testing'
# make sure we're using the stg fedsmg bus # decide whether to use prod or stg fedsmg bus
fedmsg_env: prod fedmsg_env: prod
############################################################ ############################################################
@ -41,15 +41,17 @@ grokmirror_default_branch: develop
# urls and endpoints # urls and endpoints
############################################################ ############################################################
execdb_server: http://resultsdb-stg01.qa.fedoraproject.org/execdb execdb_endpoint: execdb
execdb_statuspush: http://resultsdb-stg01.qa.fedoraproject.org/execdb/buildbottest execdb_statuspush: http://resultsdb-stg01.qa.fedoraproject.org/execdb/buildbottest
execdb_server: http://resultsdb-stg01.qa.fedoraproject.org/execdb
resultsdb_url: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb_api/api/v2.0 resultsdb_api_endpoint: resultsdb_api
resultsdb_frontend_url: http://resultsdb-stg01.qa.fedoraproject.org/ resultsdb_host: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb_api/
resultsdb_external_url: https://taskotron.stg.fedoraproject.org/resultsdb/ resultsdb_external_url: https://taskotron.stg.fedoraproject.org/resultsdb/
resultsdb_fe_endpoint: resultsdb resultsdb_fe_endpoint: resultsdb
resultsdb_frontend_url: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb/
resultsdb_url: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb_api/api/v2.0
taskotron_docs_url: https://qa.fedoraproject.org/docs/libtaskotron/latest/ taskotron_docs_url: https://qa.fedoraproject.org/docs/libtaskotron/latest/
# make sure this doesn't have a trailing slash
trigger_distgit_repo_url: git://pkgs02.phx2.fedoraproject.org trigger_distgit_repo_url: git://pkgs02.phx2.fedoraproject.org
trigger_critpath_url: https://admin.fedoraproject.org/pkgdb/api/critpath?format=json trigger_critpath_url: https://admin.fedoraproject.org/pkgdb/api/critpath?format=json
@ -58,6 +60,7 @@ instances:
- { name: "Staging", url: "https://taskotron.stg.fedoraproject.org"} - { name: "Staging", url: "https://taskotron.stg.fedoraproject.org"}
- { name: "Development", url: "http://taskotron-dev.fedoraproject.org"} - { name: "Development", url: "http://taskotron-dev.fedoraproject.org"}
############################################################ ############################################################
# taskotron details # taskotron details
############################################################ ############################################################

6
inventory/group_vars/taskotron-stg-client-hosts
View file

@ -40,9 +40,9 @@ taskotron_fas_password: ''
execdb_external_url: https://taskotron.stg.fedoraproject.org/execdb/ execdb_external_url: https://taskotron.stg.fedoraproject.org/execdb/
resultsdb_server: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb_api/api/v2.0/ resultsdb_server: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb_api/api/v2.0/
# this should be proxy01.stg through /etc/hosts # this should be proxy01.stg through /etc/hosts
bodhi_server: http://bodhi.fedoraproject.org/ bodhi_server: https://bodhi.fedoraproject.org/
kojihub_url: https://koji.stg.fedoraproject.org/kojihub kojihub_url: https://koji.fedoraproject.org/kojihub
kojipkg_url: https://kojipkgs.stg.fedoraproject.org/packages kojipkg_url: https://kojipkgs.fedoraproject.org/packages
taskotron_master: https://taskotron.stg.fedoraproject.org/taskmaster/ taskotron_master: https://taskotron.stg.fedoraproject.org/taskmaster/
resultsdb_external_url: https://taskotron.stg.fedoraproject.org/resultsdb resultsdb_external_url: https://taskotron.stg.fedoraproject.org/resultsdb
artifacts_base_url: https://taskotron.stg.fedoraproject.org/artifacts artifacts_base_url: https://taskotron.stg.fedoraproject.org/artifacts

2
roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2
View file

@ -12,9 +12,11 @@ joblog_file = {{ trigger_joblog_file }}
fuse_delay = 900 ; 15 minutes in seconds fuse_delay = 900 ; 15 minutes in seconds
git_cache_dir = {{ trigger_cache_dir }} git_cache_dir = {{ trigger_cache_dir }}
rules_template = {{ trigger_rules_template_path }} rules_template = {{ trigger_rules_template_path }}
{# enable this if you want taskotron-stg to react to just stg fedmsgs
{% if deployment_type in ['stg'] %} {% if deployment_type in ['stg'] %}
deployment_type = stg deployment_type = stg
{% endif%} {% endif%}
#}
[koji_build_completed] [koji_build_completed]
critpath_filepath = {{ trigger_critpath_file }} critpath_filepath = {{ trigger_critpath_file }}