updating taskotron buildbot roles with stg config values
This commit is contained in:
parent
6d682cdb1b
commit
b96683556d
4 changed files with 20 additions and 1 deletions
|
@ -19,6 +19,9 @@ c['slaves'] = [
|
|||
{% if deployment_type == 'dev' %}
|
||||
BuildSlave("{{ buildslave }}", "{{ dev_buildslave_password }}"),
|
||||
{% endif %}
|
||||
{% if deployment_type == 'stg' %}
|
||||
BuildSlave("{{ buildslave }}", "{{ stg_buildslave_password }}"),
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
]
|
||||
|
||||
|
@ -155,7 +158,6 @@ factory.addStep(ShellCommand(command=["runtask", '-i',
|
|||
#factory.addStep(ShellCommand(command=["cat", "/var/log/taskotron/taskotron.log"], name="cat_log"))
|
||||
|
||||
from buildbot.config import BuilderConfig
|
||||
|
||||
c['builders'] = []
|
||||
c['builders'].append(
|
||||
BuilderConfig(name="x86_64",
|
||||
|
@ -238,4 +240,7 @@ c['db'] = {
|
|||
{% if deployment_type == 'dev' %}
|
||||
'db_url' : "postgresql://{{ dev_buildmaster_db_user }}:{{ dev_buildmaster_db_password }}@{{ buildmaster_db_host }}/{{ buildmaster_db_name }}",
|
||||
{% endif %}
|
||||
{% if deployment_type == 'stg' %}
|
||||
'db_url' : "postgresql://{{ stg_buildmaster_db_user }}:{{ stg_buildmaster_db_password }}@{{ buildmaster_db_host }}/{{ buildmaster_db_name }}",
|
||||
{% endif %}
|
||||
}
|
||||
|
|
|
@ -29,3 +29,10 @@
|
|||
sudo: true
|
||||
sudo_user: postgres
|
||||
action: postgresql_user db={{ buildmaster_db_name }} user={{ dev_buildmaster_db_user }} password={{ dev_buildmaster_db_password }} role_attr_flags=NOSUPERUSER
|
||||
|
||||
- name: ensure stg user has access to dev database
|
||||
when: deployment_type == 'stg'
|
||||
delegate_to: "{{ buildmaster_db_host }}"
|
||||
sudo: true
|
||||
sudo_user: postgres
|
||||
action: postgresql_user db={{ buildmaster_db_name }} user={{ stg_buildmaster_db_user }} password={{ stg_buildmaster_db_password }} role_attr_flags=NOSUPERUSER
|
||||
|
|
|
@ -33,6 +33,10 @@ slavename = '{{ buildslave_name }}'
|
|||
{% if deployment_type == 'dev' %}
|
||||
passwd = '{{ dev_buildslave_password }}'
|
||||
{% endif %}
|
||||
{% if deployment_type == 'stg' %}
|
||||
passwd = '{{ stg_buildslave_password }}'
|
||||
{% endif %}
|
||||
|
||||
keepalive = 600
|
||||
usepty = 0
|
||||
umask = None
|
||||
|
|
|
@ -88,4 +88,7 @@ fas_username: '{{ taskotron_fas_user }}'
|
|||
{% if deployment_type == 'dev' %}
|
||||
fas_password: '{{ dev_taskotron_fas_password}}'
|
||||
{% endif %}
|
||||
{% if deployment_type == 'stg' %}
|
||||
fas_password: '{{ stg_taskotron_fas_password}}'
|
||||
{% endif %}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue