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

Prepare taskotron-prod for F24 rebuild

Browse source
This commit is contained in:
Martin Krizek 2017-01-17 20:14:26 +00:00
parent d836eacecf
commit e4ea780ca1
11 changed files with 16 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/taskotron-prod
View file

@ -36,7 +36,7 @@ execdb_statuspush: http://resultsdb01.qa.fedoraproject.org/execdb/buildbottest
resultsdb_external_url: https://taskotron.fedoraproject.org/resultsdb/ resultsdb_external_url: https://taskotron.fedoraproject.org/resultsdb/
resultsdb_fe_endpoint: resultsdb resultsdb_fe_endpoint: resultsdb
resultsdb_frontend_url: http://resultsdb01.qa.fedoraproject.org/resultsdb resultsdb_frontend_url: http://resultsdb01.qa.fedoraproject.org/resultsdb
resultsdb_url: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v1.0 resultsdb_url: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v2.0
taskotron_docs_url: https://docs.qadevel.cloud.fedoraproject.org/libtaskotron/latest/ taskotron_docs_url: https://docs.qadevel.cloud.fedoraproject.org/libtaskotron/latest/
trigger_distgit_repo_url: http://pkgs.fedoraproject.org/git trigger_distgit_repo_url: http://pkgs.fedoraproject.org/git

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

@ -35,7 +35,7 @@ taskotron_fas_user: taskotron
taskotron_fas_password: '' taskotron_fas_password: ''
execdb_external_url: https://taskotron.fedoraproject.org/execdb/ execdb_external_url: https://taskotron.fedoraproject.org/execdb/
resultsdb_server: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v1.0/ resultsdb_server: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v2.0/
# this should be proxy01.phx2 through /etc/hosts # this should be proxy01.phx2 through /etc/hosts
bodhi_server: https://bodhi.fedoraproject.org/ bodhi_server: https://bodhi.fedoraproject.org/
kojihub_url: https://koji.fedoraproject.org/kojihub kojihub_url: https://koji.fedoraproject.org/kojihub

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

@ -74,8 +74,6 @@ buildmaster_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDvFSCgmexHcx9FevlBzVA
# imagefactory config # imagefactory config
############################################################ ############################################################
#imagefactory_host: qa12.qa.fedoraproject.org imagefactory_host: qa12.qa.fedoraproject.org
# temporary point to dev images until resultsdb is upgraded to 2.0 on prod
imagefactory_host: qa11.qa.fedoraproject.org
imagefactory_baseurl: 'http://{{imagefactory_host}}:8075/imagefactory' imagefactory_baseurl: 'http://{{imagefactory_host}}:8075/imagefactory'
imagefactory_tools_branch: master imagefactory_tools_branch: master

4
inventory/host_vars/resultsdb01.qa.fedoraproject.org
View file

@ -17,8 +17,8 @@ eth0_nm: 255.255.255.128
# install # install
############################################################ ############################################################
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-23 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-24
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/ ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/
volgroup: /dev/VirtGuests volgroup: /dev/VirtGuests
datacenter: phx2 datacenter: phx2

6
inventory/host_vars/taskotron01.qa.fedoraproject.org
View file

@ -24,8 +24,8 @@ ansible_ifcfg_blacklist: true
# install # install
############################################################ ############################################################
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-23-taskotron-master ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-24-taskotron-master
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/ ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/
sudoers: "{{ private }}/files/sudo/qavirt-sudoers" sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
vmhost: virthost-comm03.qa.fedoraproject.org vmhost: virthost-comm03.qa.fedoraproject.org
volgroup: /dev/VirtGuests volgroup: /dev/VirtGuests
@ -34,7 +34,7 @@ volgroup: /dev/VirtGuests
# virtual machine # virtual machine
############################################################ ############################################################
lvm_size: 55000 lvm_size: 40000
mem_size: 4096 mem_size: 4096
num_cpus: 4 num_cpus: 4

1
playbooks/groups/taskotron.yml
View file

@ -49,6 +49,7 @@
roles: roles:
- { role: nfs/client, mnt_dir: '/srv/taskotron/', nfs_src_dir: 'fedora_taskotron_stg', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4', when: deployment_type == 'stg' } - { role: nfs/client, mnt_dir: '/srv/taskotron/', nfs_src_dir: 'fedora_taskotron_stg', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4', when: deployment_type == 'stg' }
- { role: nfs/client, mnt_dir: '/srv/taskotron/', nfs_src_dir: 'fedora_taskotron_prod', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4', when: deployment_type == 'prod' }
- { role: taskotron/grokmirror, tags: ['grokmirror'] } - { role: taskotron/grokmirror, tags: ['grokmirror'] }
# - { role: taskotron/cgit, tags: ['cgit'] } # - { role: taskotron/cgit, tags: ['cgit'] }
- { role: taskotron/buildmaster, tags: ['buildmaster'] } - { role: taskotron/buildmaster, tags: ['buildmaster'] }

8
roles/taskotron/buildmaster/tasks/main.yml
View file

@ -39,19 +39,19 @@
- name: ensure buildmaster user can use home directory (old) - name: ensure buildmaster user can use home directory (old)
file: path="{{ buildmaster_home }}" state=directory owner=buildmaster group=buildmaster mode=0775 setype=user_home_t file: path="{{ buildmaster_home }}" state=directory owner=buildmaster group=buildmaster mode=0775 setype=user_home_t
when: deployment_type == 'prod' or deployment_type == 'local' when: deployment_type == 'local'
- name: ensure buildmaster user can use home directory (new) - name: ensure buildmaster user can use home directory (new)
file: path="{{ buildmaster_home }}" state=directory owner=buildmaster group=buildmaster mode=0775 file: path="{{ buildmaster_home }}" state=directory owner=buildmaster group=buildmaster mode=0775
when: deployment_type in ['dev', 'stg'] when: deployment_type in ['dev', 'stg', 'prod']
- name: set the selinux fcontext type for the buildmaster_home to var_lib_t - name: set the selinux fcontext type for the buildmaster_home to var_lib_t
command: semanage fcontext -a -t var_lib_t "{{ buildmaster_home }}(/.*)?" command: semanage fcontext -a -t var_lib_t "{{ buildmaster_home }}(/.*)?"
when: deployment_type in ['dev', 'stg', 'qa-stg'] when: deployment_type in ['dev', 'stg', 'prod', 'qa-stg']
- name: make sure the selinux fcontext is restored - name: make sure the selinux fcontext is restored
command: restorecon -R "{{ buildmaster_home }}" command: restorecon -R "{{ buildmaster_home }}"
when: deployment_type in ['dev', 'stg', 'qa-stg'] when: deployment_type in ['dev', 'stg', 'prod', 'qa-stg']
- name: allow httpd tcp connections with selinux - name: allow httpd tcp connections with selinux
seboolean: name=httpd_can_network_connect state=true persistent=yes seboolean: name=httpd_can_network_connect state=true persistent=yes

4
roles/taskotron/buildslave/tasks/main.yml
View file

@ -55,12 +55,12 @@
- name: set the selinux fcontext type for the buildslave dir to var_lib_t - name: set the selinux fcontext type for the buildslave dir to var_lib_t
command: semanage fcontext -a -t var_lib_t "{{ item.dir }}(/.*)?" command: semanage fcontext -a -t var_lib_t "{{ item.dir }}(/.*)?"
with_items: "{{ slaves }}" with_items: "{{ slaves }}"
when: slaves is defined and deployment_type in ['dev', 'stg'] when: slaves is defined and deployment_type in ['dev', 'stg', 'prod']
- name: make sure the selinux fcontext is restored - name: make sure the selinux fcontext is restored
command: restorecon -R "{{ item.dir }}" command: restorecon -R "{{ item.dir }}"
with_items: "{{ slaves }}" with_items: "{{ slaves }}"
when: slaves is defined and deployment_type in ['dev', 'stg'] when: slaves is defined and deployment_type in ['dev', 'stg', 'prod']
- name: add buildslave users - name: add buildslave users
user: name={{ item.user }} group={{ slaves_group }} groups=testcloud,taskotron home={{ item.home }} user: name={{ item.user }} group={{ slaves_group }} groups=testcloud,taskotron home={{ item.home }}

3
roles/taskotron/imagefactory/tasks/main.yml
View file

@ -41,21 +41,18 @@
name: "Build new f24 taskotron_cloud images in ImageFactory" name: "Build new f24 taskotron_cloud images in ImageFactory"
special_time: daily special_time: daily
job: '/var/lib/fedoraqa/base_images/trigger_build/trigger_build.py build --config /etc/taskotron_base_images/config_server.ini --release 24 --arch x86_64 --flavor="taskotron_cloud" --disksize="30G" > /dev/null' job: '/var/lib/fedoraqa/base_images/trigger_build/trigger_build.py build --config /etc/taskotron_base_images/config_server.ini --release 24 --arch x86_64 --flavor="taskotron_cloud" --disksize="30G" > /dev/null'
when: deployment_type in ['dev', 'stg']
- name: Create cronjob to build new F25 images - name: Create cronjob to build new F25 images
cron: cron:
name: "Build new f25 taskotron_cloud images in ImageFactory" name: "Build new f25 taskotron_cloud images in ImageFactory"
special_time: daily special_time: daily
job: '/var/lib/fedoraqa/base_images/trigger_build/trigger_build.py build --config /etc/taskotron_base_images/config_server.ini --release 25 --arch x86_64 --flavor="taskotron_cloud" --disksize="30G" > /dev/null' job: '/var/lib/fedoraqa/base_images/trigger_build/trigger_build.py build --config /etc/taskotron_base_images/config_server.ini --release 25 --arch x86_64 --flavor="taskotron_cloud" --disksize="30G" > /dev/null'
when: deployment_type in ['dev', 'stg']
- name: Create cronjob to build new rawhide images - name: Create cronjob to build new rawhide images
cron: cron:
name: "Build new rawhide taskotron_cloud images in ImageFactory" name: "Build new rawhide taskotron_cloud images in ImageFactory"
special_time: daily special_time: daily
job: '/var/lib/fedoraqa/base_images/trigger_build/trigger_build.py build --config /etc/taskotron_base_images/config_server.ini --release rawhide --arch x86_64 --flavor="taskotron_cloud" --disksize="30G" > /dev/null' job: '/var/lib/fedoraqa/base_images/trigger_build/trigger_build.py build --config /etc/taskotron_base_images/config_server.ini --release rawhide --arch x86_64 --flavor="taskotron_cloud" --disksize="30G" > /dev/null'
when: deployment_type in ['dev', 'stg']
- name: Create cronjob to report failed builds - name: Create cronjob to report failed builds
cron: cron:

4
roles/taskotron/resultsdb-frontend/templates/settings.py.j2
View file

@ -1,10 +1,6 @@
# while you can use this as a template, we recommend that you use the blockerbugs # while you can use this as a template, we recommend that you use the blockerbugs
# cli to generate a config file # cli to generate a config file
{% if deployment_type in ['dev', 'stg'] %}
RDB_URL = 'http://127.0.0.1/{{ resultsdb_endpoint }}/api/v2.0' RDB_URL = 'http://127.0.0.1/{{ resultsdb_endpoint }}/api/v2.0'
{% else %}
RDB_URL = 'http://127.0.0.1/{{ resultsdb_endpoint }}/api/v1.0'
{% endif %}
SECRET_KEY = '{{ resultsdb_frontend_secret_key }}' SECRET_KEY = '{{ resultsdb_frontend_secret_key }}'
FILE_LOGGING = False FILE_LOGGING = False

2
roles/taskotron/taskotron-master/tasks/main.yml
View file

@ -21,7 +21,7 @@
- name: allow httpd to read artifacts on nfs - name: allow httpd to read artifacts on nfs
seboolean: name=httpd_use_nfs state=yes persistent=yes seboolean: name=httpd_use_nfs state=yes persistent=yes
when: deployment_type == 'stg' when: deployment_type in ['stg', 'prod']
- name: copy cronjob for cleaning old taskotron artifacts and buildmaster logs - name: copy cronjob for cleaning old taskotron artifacts and buildmaster logs
template: src=taskotron-clean.cron.j2 dest=/etc/cron.d/taskotron-clean.cron owner=root group=root mode=0644 template: src=taskotron-clean.cron.j2 dest=/etc/cron.d/taskotron-clean.cron owner=root group=root mode=0644