From 39032632ad230f7c53b73adb4f78f643d59b44ee Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Fri, 27 May 2016 11:35:53 +0000 Subject: [PATCH] taskotron: deploy new releases to prod --- inventory/group_vars/taskotron-prod | 3 +++ inventory/group_vars/taskotron-prod-client-hosts | 5 ++++- .../templates/taskotron.master.cfg.j2 | 10 ---------- roles/taskotron/taskotron-client/tasks/main.yml | 2 +- .../templates/settings.py.testcloud.j2 | 12 +----------- .../taskotron-client/templates/taskotron.yaml.j2 | 7 ------- roles/taskotron/taskotron-trigger/tasks/main.yml | 3 --- .../taskotron-trigger/templates/trigger.cfg.j2 | 6 ++++-- 8 files changed, 13 insertions(+), 35 deletions(-) diff --git a/inventory/group_vars/taskotron-prod b/inventory/group_vars/taskotron-prod index 4ec57a0bd7..95cbce2e76 100644 --- a/inventory/group_vars/taskotron-prod +++ b/inventory/group_vars/taskotron-prod @@ -20,6 +20,8 @@ grokmirror_repos: - { name: fedoraqa/rpmlint, url: 'https://bitbucket.org/fedoraqa/task-rpmlint.git'} - { name: fedoraqa/depcheck, url: 'https://bitbucket.org/fedoraqa/task-depcheck.git'} - { name: fedoraqa/upgradepath, url: 'https://bitbucket.org/fedoraqa/task-upgradepath.git'} + - { name: fedoraqa/dockerautotest, url: 'https://bitbucket.org/fedoraqa/task-dockerautotest.git'} + - { name: fedoraqa/abicheck, url: 'https://pagure.io/task-abicheck.git'} grokmirror_user: grokmirror grokmirror_default_branch: master @@ -35,6 +37,7 @@ 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 taskotron_docs_url: https://docs.qadevel.cloud.fedoraproject.org/libtaskotron/latest/ +trigger_distgit_repo_url: http://pkgs.fedoraproject.org/git ############################################################ # taskotron details diff --git a/inventory/group_vars/taskotron-prod-client-hosts b/inventory/group_vars/taskotron-prod-client-hosts index be8d2265ee..972b302648 100644 --- a/inventory/group_vars/taskotron-prod-client-hosts +++ b/inventory/group_vars/taskotron-prod-client-hosts @@ -45,7 +45,10 @@ artifacts_base_url: https://taskotron.fedoraproject.org/artifacts client_report_to_bodhi: 'False' -imagesdir: /srv/diskimages +imagesdir: /var/lib/diskimages + +grokmirror_user: grokmirror + ############################################################ # testcloud config diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index b9c4d04161..ac56e36a52 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -158,18 +158,12 @@ factory.addStep(ShellCommand(command=["rm", "-f", "/var/log/taskotron/taskotron. factory.addStep(ShellCommand(command=Interpolate("rm -rf /var/tmp/taskotron/%(prop:slavename)s/*"), name="rm_tmp", descriptionDone=['Clean tmp'])) {% endif %} -{% if deployment_type in ['prod'] %} -# check out the source -factory.addStep(Git(repourl=Interpolate('{{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/%(prop:taskname)s/'), - mode='full', method='clobber')) -{% elif deployment_type in ['dev', 'stg'] %} # check out the source factory.addStep(Git(repourl=Property('repo', default=Interpolate('{{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/%(prop:taskname)s/')), branch=Property('branch', default='{{ grokmirror_default_branch }}'), mode='full', method='clobber', shallow=True)) -{% endif %} # run the runner factory.addStep(ShellCommand(command=["runtask", @@ -178,11 +172,7 @@ factory.addStep(ShellCommand(command=["runtask", '-a', Interpolate('%(prop:arch)s'), '-j', Interpolate('%(prop:buildername)s/%(prop:buildnumber)s'), '--uuid', Interpolate('%(prop:uuid)s'), -{% if deployment_type in ['prod'] %} - Interpolate('%(prop:taskname)s.yml')], -{% else %} 'runtask.yml'], -{% endif %} descriptionDone=[Interpolate('%(prop:taskname)s on %(prop:item)s')], name='runtask', timeout=2400, diff --git a/roles/taskotron/taskotron-client/tasks/main.yml b/roles/taskotron/taskotron-client/tasks/main.yml index 5b9ceedf94..b58950d5a7 100644 --- a/roles/taskotron/taskotron-client/tasks/main.yml +++ b/roles/taskotron/taskotron-client/tasks/main.yml @@ -38,7 +38,7 @@ - name: generate namespaces.yaml config file template: src=namespaces.yaml.j2 dest=/etc/taskotron/namespaces.yaml owner=root group=root mode=0644 - when: deployment_type in ['dev', 'stg'] + when: deployment_type in ['dev', 'stg', 'prod'] - name: generate testcloud config file when: deployment_type in ['dev', 'stg', 'prod'] diff --git a/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2 b/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2 index 2edec34574..891c11f2ed 100644 --- a/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2 +++ b/roles/taskotron/taskotron-client/templates/settings.py.testcloud.j2 @@ -34,7 +34,7 @@ write_files: owner: root:root path: /etc/hosts permissions: '0644' -{% if deployment_type in ['prod', 'local'] %} +{% if deployment_type in ['local'] %} - encoding: b64 content: 'W2ZlZG9yYV0KbmFtZT1GZWRvcmEgJHJlbGVhc2V2ZXIgLSAkYmFzZWFyY2gKZmFpbG92ZXJtZXRob2Q9cHJpb3JpdHkKYmFzZXVybD1odHRwOi8vaW5mcmFzdHJ1Y3R1cmUuZmVkb3JhcHJvamVjdC5vcmcvcHViL2ZlZG9yYS9saW51eC9yZWxlYXNlcy8kcmVsZWFzZXZlci9FdmVyeXRoaW5nLyRiYXNlYXJjaC9vcy8KI21ldGFsaW5rPWh0dHBzOi8vbWlycm9ycy5mZWRvcmFwcm9qZWN0Lm9yZy9tZXRhbGluaz9yZXBvPWZlZG9yYS0kcmVsZWFzZXZlciZhcmNoPSRiYXNlYXJjaAplbmFibGVkPTEKbWV0YWRhdGFfZXhwaXJlPTdkCmdwZ2NoZWNrPTAKZ3Bna2V5PWZpbGU6Ly8vZXRjL3BraS9ycG0tZ3BnL1JQTS1HUEctS0VZLWZlZG9yYS0kcmVsZWFzZXZlci0kYmFzZWFyY2gKCltmZWRvcmEtZGVidWdpbmZvXQpuYW1lPUZlZG9yYSAkcmVsZWFzZXZlciAtICRiYXNlYXJjaCAtIERlYnVnCmZhaWxvdmVybWV0aG9kPXByaW9yaXR5CmJhc2V1cmw9aHR0cDovL2luZnJhc3RydWN0dXJlLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9mZWRvcmEvbGludXgvcmVsZWFzZXMvJHJlbGVhc2V2ZXIvRXZlcnl0aGluZy8kYmFzZWFyY2gvZGVidWcvCiNtZXRhbGluaz1odHRwczovL21pcnJvcnMuZmVkb3JhcHJvamVjdC5vcmcvbWV0YWxpbms/cmVwbz1mZWRvcmEtZGVidWctJHJlbGVhc2V2ZXImYXJjaD0kYmFzZWFyY2gKZW5hYmxlZD0wCm1ldGFkYXRhX2V4cGlyZT03ZApncGdjaGVjaz0xCmdwZ2tleT1maWxlOi8vL2V0Yy9wa2kvcnBtLWdwZy9SUE0tR1BHLUtFWS1mZWRvcmEtJHJlbGVhc2V2ZXItJGJhc2VhcmNoCgpbZmVkb3JhLXNvdXJjZV0KbmFtZT1GZWRvcmEgJHJlbGVhc2V2ZXIgLSBTb3VyY2UKZmFpbG92ZXJtZXRob2Q9cHJpb3JpdHkKYmFzZXVybD1odHRwOi8vaW5mcmFzdHJ1Y3R1cmUuZmVkb3JhcHJvamVjdC5vcmcvcHViL2ZlZG9yYS9saW51eC9yZWxlYXNlcy8kcmVsZWFzZXZlci9FdmVyeXRoaW5nL3NvdXJjZS9TUlBNUy8KI21ldGFsaW5rPWh0dHBzOi8vbWlycm9ycy5mZWRvcmFwcm9qZWN0Lm9yZy9tZXRhbGluaz9yZXBvPWZlZG9yYS1zb3VyY2UtJHJlbGVhc2V2ZXImYXJjaD0kYmFzZWFyY2gKZW5hYmxlZD0wCm1ldGFkYXRhX2V4cGlyZT03ZApncGdjaGVjaz0xCmdwZ2tleT1maWxlOi8vL2V0Yy9wa2kvcnBtLWdwZy9SUE0tR1BHLUtFWS1mZWRvcmEtJHJlbGVhc2V2ZXItJGJhc2VhcmNoCg==' owner: root:root @@ -70,19 +70,9 @@ write_files: # returns immediately after starting the boot process. BOOT_TIMEOUT = 60 -{# this is just in dev for now, testing before moving it anywhere else #} -{% if deployment_type in ['dev', 'stg'] %} # ram size, in MiB RAM = 6144 # Desired size, in GiB of instance disks. 0 leaves disk capacity # identical to source image DISK_SIZE = 40 -{% else %} -# ram size, in MiB -RAM = 2048 - -# Desired size, in GiB of instance disks. 0 leaves disk capacity -# identical to source image -DISK_SIZE = 10 -{% endif %} diff --git a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 index 1320547c22..299278ce8d 100644 --- a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 +++ b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 @@ -141,17 +141,10 @@ imagesdir: {{ imagesdir }} ## If set to False, latest image from imagesdir will be used instead of one at imageurl ## [default: True] -{% if deployment_type in ['dev', 'stg'] %} force_imageurl: False ## Url of an image to download and use for disposable client, if force_imageurl was set #imageurl: -{% else %} -#force_imageurl: True - -## Url of an image to download and use for disposable client, if force_imageurl was set -imageurl: file:///srv/diskimages/20160126-taskotron-f23.qcow2 -{% endif %} ## Default distro/release/flavor/arch for the disposable images discovery #default_disposable_distro: fedora diff --git a/roles/taskotron/taskotron-trigger/tasks/main.yml b/roles/taskotron/taskotron-trigger/tasks/main.yml index 9109a5e501..04d81ba36d 100644 --- a/roles/taskotron/taskotron-trigger/tasks/main.yml +++ b/roles/taskotron/taskotron-trigger/tasks/main.yml @@ -42,18 +42,15 @@ - name: download critpath list get_url: url={{ trigger_critpath_url }} dest={{ trigger_critpath_file }} mode=0644 owner=fedmsg group=fedmsg - when: deployment_type in ['dev', 'stg'] - name: create a cronjob to download crithpath list as a task-libabigail whitelist cron: name="download crithpath list" special_time=daily job="wget -O {{ trigger_critpath_file }} {{ trigger_critpath_url }} && chown fedmsg:fedmsg {{ trigger_critpath_file }}" - when: deployment_type in ['dev', 'stg'] - name: copy tmpfiles.d for trigger distgit cache template: src=tmpfiles.d.trigger.conf.j2 dest=/etc/tmpfiles.d/trigger.conf owner=root group=root mode=0644 - when: deployment_type in ['dev', 'stg'] - name: start and enable fedmsg-hub service service: name=fedmsg-hub enabled=yes state=started diff --git a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 index 7361caaf36..919ea705cc 100644 --- a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 +++ b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 @@ -15,9 +15,12 @@ job_logging = True joblog_file = {{ trigger_joblog_file }} fuse_delay = 900 ; 15 minutes in seconds -{% if deployment_type in ['dev', 'stg'] %} [distgit] +{% if deployment_type in ['dev', 'stg'] %} enabled = True +{% else %} +enabled = False +{% endif %} cache_dir = {{ trigger_cache_dir }} repo_url = {{ trigger_distgit_repo_url }} namespace = rpms-checks @@ -25,4 +28,3 @@ namespace = rpms-checks [abicheck] critpath_filepath = {{ trigger_critpath_file }} critpath_exclude = -{% endif %}