cleaned up use of qadevel-prod deployment type

This commit is contained in:
Tim Flink 2016-12-15 21:00:56 +00:00
parent b7d57a01cf
commit a5dc34d3e1
4 changed files with 8 additions and 33 deletions

View file

@ -19,6 +19,7 @@ sslonly: false
#sshd_port: 222
sshd_port: 22
external_hostname: qa.fedoraproject.org
deployment_type: qa-prod
# this enables infrastructure-testing repo
extra_enablerepos: 'infrastructure-testing'

View file

@ -18,12 +18,7 @@ from buildbot.buildslave import openstack
c['slaves'] = [
{% for buildslave in buildslaves %}
{% if deployment_type == 'qa-stg' %}
BuildSlave("{{ buildslave }}", "{{ qa_stg_buildslave_password }}"),
{% endif %}
{% if deployment_type == 'qadevel-prod' %}
BuildSlave("{{ buildslave }}", "{{ qadevel_prod_buildslave_password }}"),
{% endif %}
{% endfor %}
]
@ -58,7 +53,7 @@ interval = {{ buildslave_poll_interval }}
c['change_source'] = []
{#
{% if deployment_type == 'qadevel-prod' %}
{% if deployment_type == 'qa-prod' %}
#}
c['change_source'].append(GitPoller(
'https://bitbucket.org/fedoraqa/taskotron-trigger.git',
@ -164,21 +159,6 @@ from buildbot.steps.transfer import DirectoryUpload
{% if deployment_type == 'qadevel-prod' %}
def create_test_factory(repo_name, func=True):
factory = BuildFactory()
factory.addStep(Git(repourl=Interpolate('https://bitbucket.org/fedoraqa/%s.git' % repo_name),
mode='full',method='clobber'))
factory.addStep(ShellCommand(command=['virtualenv', '--system-site-packages', 'env']))
factory.addStep(ShellCommand(command=['bash', '-c', 'source env/bin/activate; pip install -r requirements.txt']))
factory.addStep(ShellCommand(command=['bash', '-c', 'source env/bin/activate; TEST="true" py.test %s testing/' % '-F' if func else ''], name=repo_name))
return factory
{% endif %}
{% if deployment_type == 'qa-stg' %}
def create_test_factory(repo_name, func=True):
factory = BuildFactory()
# factory.addStep(Git(repourl=Interpolate('{{ repo_base }}/%s.git' % repo_name),
@ -193,8 +173,6 @@ def create_test_factory(repo_name, func=True):
return factory
{% endif %}
trigger_factory = create_test_factory('taskotron-trigger')
libtaskotron_factory = create_test_factory('libtaskotron-docs')
resultsdb_factory = create_test_factory('resultsdb')
@ -205,7 +183,7 @@ from buildbot.config import BuilderConfig
c['builders'] = []
{#
{% if deployment_type == 'qadevel-prod' %}
{% if deployment_type == 'qa-prod' %}
#}
c['builders'].append(
BuilderConfig(name="trigger-builder",
@ -260,8 +238,8 @@ authz_cfg=authz.Authz(
{% if deployment_type == 'qa-stg' %}
auth=auth.BasicAuth([("{{ qa_stg_buildbot_master_user }}","{{ qa_stg_buildbot_master_password }}")]),
{% endif %}
{% if deployment_type == 'qadevel-prod' %}
auth=auth.BasicAuth([("{{ qadevel_prod_buildbot_master_user }}","{{ qadevel_prod_buildbot_master_password }}")]),
{% if deployment_type == 'qa-prod' %}
auth=auth.BasicAuth([("{{ qa_prod_prod_buildbot_master_user }}","{{ qa_prod_prod_buildbot_master_password }}")]),
{% endif %}
gracefulShutdown = False,
forceBuild = 'auth', # use this to test your slave once it is set up

View file

@ -24,13 +24,13 @@
- name: ensure additional packages required for CI buildmaster are installed
yum: name={{ item }} state=present enablerepo={{ extra_enablerepos }}
when: ansible_distribution_major_version|int < 22 and (deployment_type == 'qadevel-prod' or deployment_type == 'qa-stg')
when: ansible_distribution_major_version|int < 22 and (deployment_type == 'qa-prod' or deployment_type == 'qa-stg')
with_items:
- python-novaclient
- name: ensure additional packages required for CI buildmaster are installed
dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }}
when: ansible_distribution_major_version|int > 21 and (deployment_type == 'qadevel-prod' or deployment_type == 'qa-stg')
when: ansible_distribution_major_version|int > 21 and (deployment_type == 'qa-prod' or deployment_type == 'qa-stg')
with_items:
- python-novaclient

View file

@ -34,7 +34,7 @@ except ImportError:
buildmaster_host = '{{ buildmaster }}'
port = 9989
{% if deployment_type in ['local', 'qa-stg'] %}
{% if deployment_type in ['local', 'qa-stg', 'qa-prod'] %}
slavename = '{{ buildslave_name }}'
passwd = '{{ buildslave_password }}'
{% endif %}
@ -43,10 +43,6 @@ slavename = '{{ item.user }}'
passwd = '{{ buildslave_password }}'
{% endif %}
{% if deployment_type == 'qadevel-prod' %}
passwd = '{{ qadevel_prod_buildslave_password }}'
{% endif %}
keepalive = 600
usepty = 0
umask = 0022