From cfc6866936e992e8893c1febf423db37859b9a79 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Tue, 14 Mar 2017 08:33:10 +0000 Subject: [PATCH] Rawhide is 27 now --- .../templates/config.ini.j2 | 2 +- roles/taskotron/imagefactory/tasks/main.yml | 23 +++++++------------ .../templates/config_server.ini.j2 | 2 +- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/roles/taskotron/imagefactory-client/templates/config.ini.j2 b/roles/taskotron/imagefactory-client/templates/config.ini.j2 index 14258feec9..a0a4e8bc61 100644 --- a/roles/taskotron/imagefactory-client/templates/config.ini.j2 +++ b/roles/taskotron/imagefactory-client/templates/config.ini.j2 @@ -1,4 +1,4 @@ [default] imgfac_base_url={{imagefactory_baseurl}} -rawhide=26 +rawhide=27 diff --git a/roles/taskotron/imagefactory/tasks/main.yml b/roles/taskotron/imagefactory/tasks/main.yml index a0469c567c..c5559040a6 100644 --- a/roles/taskotron/imagefactory/tasks/main.yml +++ b/roles/taskotron/imagefactory/tasks/main.yml @@ -36,23 +36,16 @@ - name: Generate configuration template: src=config_server.ini.j2 dest=/etc/taskotron_base_images/config_server.ini owner=root group=root mode=0644 -- name: Create cronjob to build new F24 images +- name: Create cronjob to build new {{ item }} images cron: - name: "Build new f24 taskotron_cloud images in ImageFactory" + name: "Build new {{ item }} 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' - -- 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' - -- 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' + job: '/var/lib/fedoraqa/base_images/trigger_build/trigger_build.py build --config /etc/taskotron_base_images/config_server.ini --release {{ item }} --arch x86_64 --flavor="taskotron_cloud" --disksize="30G" > /dev/null' + with_items: + - f24 + - f25 + - f26 + - rawhide - name: Create cronjob to report failed builds cron: diff --git a/roles/taskotron/imagefactory/templates/config_server.ini.j2 b/roles/taskotron/imagefactory/templates/config_server.ini.j2 index 7f32d52b61..41f7cd102d 100644 --- a/roles/taskotron/imagefactory/templates/config_server.ini.j2 +++ b/roles/taskotron/imagefactory/templates/config_server.ini.j2 @@ -1,6 +1,6 @@ [default] imgfac_base_url=http://127.0.0.1:8075/imagefactory -rawhide=26 +rawhide=27 mail_from={{deployment_type}}.imagefactory@qa.fedoraproject.org mail_to=jskladan@redhat.com tflink@redhat.com