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

taskotron group vars: synchronize configs between envs

Browse source 
Make the lines appear in roughly the same order between {dev,stg,prod}
files to make diffing easier. Sort grokmirror repos by name.
This commit is contained in:
Kamil Páral 2017-11-15 12:05:36 +01:00
parent 61d5f66985
commit 4380801eab
5 changed files with 56 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

28
inventory/group_vars/taskotron-dev
View file

@ -3,14 +3,15 @@
# general information
############################################################
fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice,sysadmin-noc,sysadmin-veteran
tcp_ports: [ 80, 443, "{{ buildslave_port }}" ]
freezes: false
external_hostname: taskotron-dev.fedoraproject.org
deployment_type: dev
tcp_ports: [ 80, 443, "{{ buildslave_port }}" ]
robots_path: /var/www/html
freezes: false
fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice,sysadmin-noc,sysadmin-veteran
############################################################
# task repo details
############################################################
@ -18,17 +19,17 @@ robots_path: /var/www/html
grokmirror_basedir: /var/lib/git/mirror
grokmirror_user: grokmirror
grokmirror_repos:
- { name: fedoraqa/abicheck, url: 'https://pagure.io/task-abicheck.git'}
- { name: fedoraqa/dockerautotest, url: 'https://pagure.io/taskotron/task-dockerautotest.git'}
- { name: fedoraqa/fedora-cloud-tests, url: 'https://pagure.io/taskotron/task-fedora-cloud-tests.git'}
- { name: fedoraqa/check_modulemd, url: 'https://github.com/fedora-modularity/check_modulemd'}
- { name: fedoraqa/modularity-testing-framework, url: 'https://pagure.io/taskotron/task-modularity-testing-framework.git'}
- { name: fedoraqa/python-versions, url: 'https://github.com/fedora-python/taskotron-python-versions'}
- { name: fedoraqa/rpmdeplint, url: 'https://pagure.io/taskotron/task-rpmdeplint.git'}
- { name: fedoraqa/rpmgrill, url: 'https://pagure.io/taskotron/task-rpmgrill.git'}
- { name: fedoraqa/rpmlint, url: 'https://pagure.io/taskotron/task-rpmlint.git'}
- { name: fedoraqa/upgradepath, url: 'https://pagure.io/taskotron/task-upgradepath.git'}
- { name: fedoraqa/dockerautotest, url: 'https://pagure.io/taskotron/task-dockerautotest.git'}
- { name: fedoraqa/abicheck, url: 'https://pagure.io/task-abicheck.git'}
- { name: fedoraqa/rpmgrill, url: 'https://pagure.io/taskotron/task-rpmgrill.git'}
- { name: fedoraqa/python-versions, url: 'https://github.com/fedora-python/taskotron-python-versions'}
- { name: fedoraqa/check_modulemd, url: 'https://github.com/fedora-modularity/check_modulemd'}
- { name: fedoraqa/rpmdeplint, url: 'https://pagure.io/taskotron/task-rpmdeplint.git'}
- { name: fedoraqa/upstream-atomic, url: 'https://pagure.io/taskotron/task-upstream-atomic.git'}
- { name: fedoraqa/fedora-cloud-tests, url: 'https://pagure.io/taskotron/task-fedora-cloud-tests.git'}
- { name: fedoraqa/modularity-testing-framework, url: 'https://pagure.io/taskotron/task-modularity-testing-framework.git'}
grokmirror_default_branch: develop
@ -39,13 +40,16 @@ grokmirror_default_branch: develop
execdb_endpoint: execdb
execdb_statuspush: http://resultsdb-dev01.qa.fedoraproject.org/execdb/buildbottest
execdb_server: http://resultsdb-dev01.qa.fedoraproject.org/execdb
resultsdb_api_endpoint: resultsdb_api
resultsdb_host: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/
resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb/
resultsdb_fe_endpoint: resultsdb
resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/
resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v2.0
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_abicheck_blacklist: [firefox,thunderbird,kernel,kdelibs,kdepim,qt,mariadb,java-1.8.0-openjdk,libreoffice]

2
inventory/group_vars/taskotron-dev-client-hosts
View file

@ -38,6 +38,7 @@ taskotron_fas_password: ''
execdb_external_url: https://taskotron-dev.fedoraproject.org/execdb
resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v2.0
# this should be proxy01.phx2 through /etc/hosts
bodhi_server: https://bodhi.fedoraproject.org/
kojihub_url: https://koji.fedoraproject.org/kojihub
kojipkg_url: https://kojipkgs.fedoraproject.org/packages
@ -65,7 +66,6 @@ buildslave_pubkey: "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA4EOTNfPIvIjCLNRYauVquS2L
buildslave_private_sshkey_file: dev-buildslave-sshkey/dev_buildslave
buildslave_public_sshkey_file: dev-buildslave-sshkey/dev_buildslave.pub
buildmaster_pubkey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCpXXWKllUaHf8It2r4HC02mkxmJlX/gqYmAmgcOM850xcyEAx72taJgfW4vWgs1Y2HLw4jt16KeOIv9bF8U+aHV74ASqwmmsSq2U6gr/HXIQcY0vkzZtKq72pPZuow4vX6Q8Nw0Zmo7p9LXqKIkeI1ujYztyxAhgXkCtHmo1NjDAP7kFB1o9ouplQ449hK5sfXz6ALH6adFrbKI4zqZLcvEJsLjmLRu03J7SrzJb+f6HWNuQCs9f7ppSBlfdP6giNLzxWRETee9kEbQsKadfRIG9SAYgyduDCinxZhgJj0t2V83gq8vE1wwOB8c/+8R+0INS4DUn67IMicoqR1GUhF"

38
inventory/group_vars/taskotron-prod
View file

@ -3,10 +3,11 @@
# general information
############################################################
deployment_type: prod
external_hostname: taskotron.fedoraproject.org
robots_path: /var/www/html
deployment_type: prod
tcp_ports: [ 80, 443, "{{ buildslave_port }}" ]
robots_path: /var/www/html
# this enables extra repos during dnf operations
extra_enablerepos: ''
@ -16,19 +17,19 @@ extra_enablerepos: ''
############################################################
grokmirror_basedir: /var/lib/git/mirror
grokmirror_user: grokmirror
grokmirror_repos:
- { name: fedoraqa/abicheck, url: 'https://pagure.io/task-abicheck.git'}
- { name: fedoraqa/dockerautotest, url: 'https://pagure.io/taskotron/task-dockerautotest.git'}
- { name: fedoraqa/fedora-cloud-tests, url: 'https://pagure.io/taskotron/task-fedora-cloud-tests.git'}
- { name: fedoraqa/check_modulemd, url: 'https://github.com/fedora-modularity/check_modulemd'}
- { name: fedoraqa/modularity-testing-framework, url: 'https://pagure.io/taskotron/task-modularity-testing-framework.git'}
- { name: fedoraqa/python-versions, url: 'https://github.com/fedora-python/taskotron-python-versions'}
- { name: fedoraqa/rpmdeplint, url: 'https://pagure.io/taskotron/task-rpmdeplint.git'}
- { name: fedoraqa/rpmgrill, url: 'https://pagure.io/taskotron/task-rpmgrill.git'}
- { name: fedoraqa/rpmlint, url: 'https://pagure.io/taskotron/task-rpmlint.git'}
- { name: fedoraqa/upgradepath, url: 'https://pagure.io/taskotron/task-upgradepath.git'}
- { name: fedoraqa/dockerautotest, url: 'https://pagure.io/taskotron/task-dockerautotest.git'}
- { name: fedoraqa/abicheck, url: 'https://pagure.io/task-abicheck.git'}
- { name: fedoraqa/rpmgrill, url: 'https://pagure.io/taskotron/task-rpmgrill.git'}
- { name: fedoraqa/python-versions, url: 'https://github.com/fedora-python/taskotron-python-versions'}
- { name: fedoraqa/check_modulemd, url: 'https://github.com/fedora-modularity/check_modulemd'}
- { name: fedoraqa/rpmdeplint, url: 'https://pagure.io/taskotron/task-rpmdeplint.git'}
- { name: fedoraqa/upstream-atomic, url: 'https://pagure.io/taskotron/task-upstream-atomic.git'}
- { name: fedoraqa/fedora-cloud-tests, url: 'https://pagure.io/taskotron/task-fedora-cloud-tests.git'}
- { name: fedoraqa/modularity-testing-framework, url: 'https://pagure.io/taskotron/task-modularity-testing-framework.git'}
grokmirror_user: grokmirror
grokmirror_default_branch: master
@ -38,11 +39,15 @@ grokmirror_default_branch: master
execdb_server: http://resultsdb01.qa.fedoraproject.org/execdb
execdb_statuspush: http://resultsdb01.qa.fedoraproject.org/execdb/buildbottest
resultsdb_external_url: https://taskotron.fedoraproject.org/resultsdb/
resultsdb_fe_endpoint: resultsdb
resultsdb_frontend_url: http://resultsdb01.qa.fedoraproject.org/resultsdb
resultsdb_url: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v2.0
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_abicheck_blacklist: [firefox,thunderbird,kernel,kdelibs,kdepim,qt,mariadb,java-1.8.0-openjdk,libreoffice]
instances:
@ -50,15 +55,16 @@ instances:
- { name: "Staging", url: "https://taskotron.stg.fedoraproject.org"}
- { name: "Development", url: "http://taskotron-dev.fedoraproject.org"}
############################################################
# taskotron details
############################################################
public_artifacts_dir: /srv/taskotron/artifacts
cgit_root_title: "Taskotron Git Mirror"
settings_dir: /etc/taskotron
landingpage_title: "Production"
landingpage_instance: "prod"
settings_dir: /etc/taskotron
public_artifacts_dir: /srv/taskotron/artifacts
cgit_root_title: "Taskotron Git Mirror"
############################################################
# buildbot details
@ -71,9 +77,9 @@ buildmaster_db_password: "{{ prod_buildmaster_db_password }}"
buildmaster_dir: /srv/buildmaster/master
buildmaster_endpoint: taskmaster
buildmaster_home: /srv/buildmaster
buildmaster_user: buildmaster
buildmaster_template: taskotron.master.cfg.j2
buildmaster_user: buildmaster
buildslave_ssh_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA3Fhg7qUJ1+3N2YficTWQGEPm5JYmqDE7JbnpTTjQixd51r36YJ93sMQV63UOPkVaqPHkzIETUuvWLa/fnDhyYEnLT8mSgCqGViyd93MHYFD+nIzL1OIewKPiVbBdmlDOABD+ROSkC/wAfqJMgleqdDonWC8R0Qo+Y2r4sLMF7dxdPdRe3+WIcvC5YqDUZN/2gfsZ2tnAakZ1sGcX0yPvnpF9FmtRfkNp60OK7NXMLGV7Tayhkib05rGHl0q5dK4/vxKKk/aNgIK7gE3XFF7f+S2PDjvH3q/yby2Z3Wkp61JpVl+RTGz/XKpejUSDkJyQkbIC5+QQFeei58RLDJhzLQ== tflink@lockbox01.phx2.fedoraproject.org'
buildslave_port: 9989
buildslave_password: "{{ prod_buildslave_password }}"
buildslave_ssh_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA3Fhg7qUJ1+3N2YficTWQGEPm5JYmqDE7JbnpTTjQixd51r36YJ93sMQV63UOPkVaqPHkzIETUuvWLa/fnDhyYEnLT8mSgCqGViyd93MHYFD+nIzL1OIewKPiVbBdmlDOABD+ROSkC/wAfqJMgleqdDonWC8R0Qo+Y2r4sLMF7dxdPdRe3+WIcvC5YqDUZN/2gfsZ2tnAakZ1sGcX0yPvnpF9FmtRfkNp60OK7NXMLGV7Tayhkib05rGHl0q5dK4/vxKKk/aNgIK7gE3XFF7f+S2PDjvH3q/yby2Z3Wkp61JpVl+RTGz/XKpejUSDkJyQkbIC5+QQFeei58RLDJhzLQ== tflink@lockbox01.phx2.fedoraproject.org'

2
inventory/group_vars/taskotron-prod-client-hosts
View file

@ -12,6 +12,7 @@ tcp_ports: [ "{{ buildslave_port }}", 8075]
sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
freezes: false
# this enables extra repos during dnf install but that's broken right now, remember to re-enable
extra_enablerepos: ''
@ -31,6 +32,7 @@ taskotron_admin_email: taskotron-admin-members@fedoraproject.org
############################################################
taskotron_fas_user: taskotron
# stuff is kinda not working for stg bodhi right now. workaround by having empty fas password
#taskotron_fas_password: '{{ prod_taskotron_fas_password}}'
taskotron_fas_password: ''

27
inventory/group_vars/taskotron-stg
View file

@ -3,13 +3,14 @@
# general information
############################################################
tcp_ports: [ 80, 443, "{{ buildslave_port }}" ]
freezes: false
external_hostname: taskotron.stg.fedoraproject.org
deployment_type: stg
tcp_ports: [ 80, 443, "{{ buildslave_port }}" ]
robots_path: /var/www/html
freezes: false
# decide whether to use prod or stg fedsmg bus
fedmsg_env: prod
@ -20,17 +21,17 @@ fedmsg_env: prod
grokmirror_basedir: /var/lib/git/mirror
grokmirror_user: grokmirror
grokmirror_repos:
- { name: fedoraqa/abicheck, url: 'https://pagure.io/task-abicheck.git'}
- { name: fedoraqa/dockerautotest, url: 'https://pagure.io/taskotron/task-dockerautotest.git'}
- { name: fedoraqa/fedora-cloud-tests, url: 'https://pagure.io/taskotron/task-fedora-cloud-tests.git'}
- { name: fedoraqa/check_modulemd, url: 'https://github.com/fedora-modularity/check_modulemd'}
- { name: fedoraqa/modularity-testing-framework, url: 'https://pagure.io/taskotron/task-modularity-testing-framework.git'}
- { name: fedoraqa/python-versions, url: 'https://github.com/fedora-python/taskotron-python-versions'}
- { name: fedoraqa/rpmdeplint, url: 'https://pagure.io/taskotron/task-rpmdeplint.git'}
- { name: fedoraqa/rpmgrill, url: 'https://pagure.io/taskotron/task-rpmgrill.git'}
- { name: fedoraqa/rpmlint, url: 'https://pagure.io/taskotron/task-rpmlint.git'}
- { name: fedoraqa/upgradepath, url: 'https://pagure.io/taskotron/task-upgradepath.git'}
- { name: fedoraqa/dockerautotest, url: 'https://pagure.io/taskotron/task-dockerautotest.git'}
- { name: fedoraqa/abicheck, url: 'https://pagure.io/task-abicheck.git'}
- { name: fedoraqa/rpmgrill, url: 'https://pagure.io/taskotron/task-rpmgrill.git'}
- { name: fedoraqa/python-versions, url: 'https://github.com/fedora-python/taskotron-python-versions'}
- { name: fedoraqa/check_modulemd, url: 'https://github.com/fedora-modularity/check_modulemd'}
- { name: fedoraqa/rpmdeplint, url: 'https://pagure.io/taskotron/task-rpmdeplint.git'}
- { name: fedoraqa/upstream-atomic, url: 'https://pagure.io/taskotron/task-upstream-atomic.git'}
- { name: fedoraqa/fedora-cloud-tests, url: 'https://pagure.io/taskotron/task-fedora-cloud-tests.git'}
- { name: fedoraqa/modularity-testing-framework, url: 'https://pagure.io/taskotron/task-modularity-testing-framework.git'}
grokmirror_default_branch: develop
@ -41,18 +42,20 @@ grokmirror_default_branch: develop
execdb_endpoint: execdb
execdb_statuspush: http://resultsdb-stg01.qa.fedoraproject.org/execdb/buildbottest
execdb_server: http://resultsdb-stg01.qa.fedoraproject.org/execdb
resultsdb_api_endpoint: resultsdb_api
resultsdb_host: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb_api/
resultsdb_external_url: https://taskotron.stg.fedoraproject.org/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/
# make sure this doesn't have a trailing slash
trigger_distgit_repo_url: https://src.stg.fedoraproject.org/
trigger_critpath_url: https://admin.stg.fedoraproject.org/pkgdb/api/critpath?format=json
trigger_abicheck_blacklist: [firefox,thunderbird,kernel,kdelibs,kdepim,qt,mariadb,java-1.8.0-openjdk,libreoffice]
instances:
- { name: "Production", url: "https://taskotron.fedoraproject.org"}
- { name: "Staging", url: "https://taskotron.stg.fedoraproject.org"}