summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--inventory/group_vars/taskotron-prod2
-rw-r--r--inventory/group_vars/taskotron-prod-client-hosts2
-rw-r--r--inventory/group_vars/taskotron-stg-client-hosts4
-rw-r--r--inventory/host_vars/resultsdb01.qa.fedoraproject.org4
-rw-r--r--inventory/host_vars/taskotron01.qa.fedoraproject.org6
-rw-r--r--playbooks/groups/taskotron.yml1
-rw-r--r--roles/taskotron/buildmaster/tasks/main.yml8
-rw-r--r--roles/taskotron/buildslave/tasks/main.yml4
-rw-r--r--roles/taskotron/imagefactory/tasks/main.yml3
-rw-r--r--roles/taskotron/resultsdb-frontend/templates/settings.py.j24
-rw-r--r--roles/taskotron/taskotron-master/tasks/main.yml2
11 files changed, 16 insertions, 24 deletions
diff --git a/inventory/group_vars/taskotron-prod b/inventory/group_vars/taskotron-prod
index 9fb427fcb..aab170e97 100644
--- a/inventory/group_vars/taskotron-prod
+++ b/inventory/group_vars/taskotron-prod
@@ -36,7 +36,7 @@ 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/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/
trigger_distgit_repo_url: http://pkgs.fedoraproject.org/git
diff --git a/inventory/group_vars/taskotron-prod-client-hosts b/inventory/group_vars/taskotron-prod-client-hosts
index 90f2c70e5..066d69161 100644
--- a/inventory/group_vars/taskotron-prod-client-hosts
+++ b/inventory/group_vars/taskotron-prod-client-hosts
@@ -35,7 +35,7 @@ taskotron_fas_user: taskotron
taskotron_fas_password: ''
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
bodhi_server: https://bodhi.fedoraproject.org/
kojihub_url: https://koji.fedoraproject.org/kojihub
diff --git a/inventory/group_vars/taskotron-stg-client-hosts b/inventory/group_vars/taskotron-stg-client-hosts
index cb5ae84dd..a38aa8032 100644
--- a/inventory/group_vars/taskotron-stg-client-hosts
+++ b/inventory/group_vars/taskotron-stg-client-hosts
@@ -74,8 +74,6 @@ buildmaster_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDvFSCgmexHcx9FevlBzVA
# imagefactory config
############################################################
-#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_host: qa12.qa.fedoraproject.org
imagefactory_baseurl: 'http://{{imagefactory_host}}:8075/imagefactory'
imagefactory_tools_branch: master
diff --git a/inventory/host_vars/resultsdb01.qa.fedoraproject.org b/inventory/host_vars/resultsdb01.qa.fedoraproject.org
index b200e2d2d..3d78d5a2d 100644
--- a/inventory/host_vars/resultsdb01.qa.fedoraproject.org
+++ b/inventory/host_vars/resultsdb01.qa.fedoraproject.org
@@ -17,8 +17,8 @@ eth0_nm: 255.255.255.128
# install
############################################################
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-23
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-24
+ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/
volgroup: /dev/VirtGuests
datacenter: phx2
diff --git a/inventory/host_vars/taskotron01.qa.fedoraproject.org b/inventory/host_vars/taskotron01.qa.fedoraproject.org
index e8e33b1e7..d5fb7f428 100644
--- a/inventory/host_vars/taskotron01.qa.fedoraproject.org
+++ b/inventory/host_vars/taskotron01.qa.fedoraproject.org
@@ -24,8 +24,8 @@ ansible_ifcfg_blacklist: true
# install
############################################################
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-23-taskotron-master
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/
+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/24/Server/x86_64/os/
sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
vmhost: virthost-comm03.qa.fedoraproject.org
volgroup: /dev/VirtGuests
@@ -34,7 +34,7 @@ volgroup: /dev/VirtGuests
# virtual machine
############################################################
-lvm_size: 55000
+lvm_size: 40000
mem_size: 4096
num_cpus: 4
diff --git a/playbooks/groups/taskotron.yml b/playbooks/groups/taskotron.yml
index 594ef39ea..8c44ee801 100644
--- a/playbooks/groups/taskotron.yml
+++ b/playbooks/groups/taskotron.yml
@@ -49,6 +49,7 @@
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_prod', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4', when: deployment_type == 'prod' }
- { role: taskotron/grokmirror, tags: ['grokmirror'] }
# - { role: taskotron/cgit, tags: ['cgit'] }
- { role: taskotron/buildmaster, tags: ['buildmaster'] }
diff --git a/roles/taskotron/buildmaster/tasks/main.yml b/roles/taskotron/buildmaster/tasks/main.yml
index 263ca8dea..131d09be2 100644
--- a/roles/taskotron/buildmaster/tasks/main.yml
+++ b/roles/taskotron/buildmaster/tasks/main.yml
@@ -39,19 +39,19 @@
- 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
- when: deployment_type == 'prod' or deployment_type == 'local'
+ when: deployment_type == 'local'
- name: ensure buildmaster user can use home directory (new)
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
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
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
seboolean: name=httpd_can_network_connect state=true persistent=yes
diff --git a/roles/taskotron/buildslave/tasks/main.yml b/roles/taskotron/buildslave/tasks/main.yml
index 3175e78fb..77fe7204e 100644
--- a/roles/taskotron/buildslave/tasks/main.yml
+++ b/roles/taskotron/buildslave/tasks/main.yml
@@ -55,12 +55,12 @@
- name: set the selinux fcontext type for the buildslave dir to var_lib_t
command: semanage fcontext -a -t var_lib_t "{{ item.dir }}(/.*)?"
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
command: restorecon -R "{{ item.dir }}"
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
user: name={{ item.user }} group={{ slaves_group }} groups=testcloud,taskotron home={{ item.home }}
diff --git a/roles/taskotron/imagefactory/tasks/main.yml b/roles/taskotron/imagefactory/tasks/main.yml
index ae91fba30..a0469c567 100644
--- a/roles/taskotron/imagefactory/tasks/main.yml
+++ b/roles/taskotron/imagefactory/tasks/main.yml
@@ -41,21 +41,18 @@
name: "Build new f24 taskotron_cloud images in ImageFactory"
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'
- when: deployment_type in ['dev', 'stg']
- name: Create cronjob to build new F25 images
cron:
name: "Build new f25 taskotron_cloud images in ImageFactory"
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'
- when: deployment_type in ['dev', 'stg']
- name: Create cronjob to build new rawhide images
cron:
name: "Build new rawhide taskotron_cloud images in ImageFactory"
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'
- when: deployment_type in ['dev', 'stg']
- name: Create cronjob to report failed builds
cron:
diff --git a/roles/taskotron/resultsdb-frontend/templates/settings.py.j2 b/roles/taskotron/resultsdb-frontend/templates/settings.py.j2
index 7fc571a42..6c6042e07 100644
--- a/roles/taskotron/resultsdb-frontend/templates/settings.py.j2
+++ b/roles/taskotron/resultsdb-frontend/templates/settings.py.j2
@@ -1,10 +1,6 @@
# while you can use this as a template, we recommend that you use the blockerbugs
# cli to generate a config file
-{% if deployment_type in ['dev', 'stg'] %}
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 }}'
FILE_LOGGING = False
diff --git a/roles/taskotron/taskotron-master/tasks/main.yml b/roles/taskotron/taskotron-master/tasks/main.yml
index 7e9a49c2a..61c4d2838 100644
--- a/roles/taskotron/taskotron-master/tasks/main.yml
+++ b/roles/taskotron/taskotron-master/tasks/main.yml
@@ -21,7 +21,7 @@
- name: allow httpd to read artifacts on nfs
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
template: src=taskotron-clean.cron.j2 dest=/etc/cron.d/taskotron-clean.cron owner=root group=root mode=0644
generated by cgit (git 2.34.1) at 2025-10-04 16:02:48 +0000