taskotron-stg: deploy new trigger and libtaskotron

inventory/group_vars/taskotron-stg

@@ -24,6 +24,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/libabigail, url: 'https://github.com/sinnykumari/task-libabigail.git'}
 grokmirror_default_branch: develop
 
 

inventory/group_vars/taskotron-stg-client-hosts

@@ -50,6 +50,8 @@ client_report_to_bodhi: 'False'
 
 imagesdir: /srv/diskimages
 
+grokmirror_user: grokmirror
+
 
 ############################################################
 # testcloud config

roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2

@@ -158,11 +158,11 @@ 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 ['stg', 'prod'] %}
+{% 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'] %}
+{% 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 }}'),

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 == 'dev'
+  when: deployment_type in ['dev', 'stg']
 
 - name: generate testcloud config file
   when: deployment_type in ['dev', 'stg', 'prod']

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 ['stg', 'prod', 'local'] %}
+{% if deployment_type in ['prod', 'local'] %}
     - encoding: b64
       content: 'W2ZlZG9yYV0KbmFtZT1GZWRvcmEgJHJlbGVhc2V2ZXIgLSAkYmFzZWFyY2gKZmFpbG92ZXJtZXRob2Q9cHJpb3JpdHkKYmFzZXVybD1odHRwOi8vaW5mcmFzdHJ1Y3R1cmUuZmVkb3JhcHJvamVjdC5vcmcvcHViL2ZlZG9yYS9saW51eC9yZWxlYXNlcy8kcmVsZWFzZXZlci9FdmVyeXRoaW5nLyRiYXNlYXJjaC9vcy8KI21ldGFsaW5rPWh0dHBzOi8vbWlycm9ycy5mZWRvcmFwcm9qZWN0Lm9yZy9tZXRhbGluaz9yZXBvPWZlZG9yYS0kcmVsZWFzZXZlciZhcmNoPSRiYXNlYXJjaAplbmFibGVkPTEKbWV0YWRhdGFfZXhwaXJlPTdkCmdwZ2NoZWNrPTAKZ3Bna2V5PWZpbGU6Ly8vZXRjL3BraS9ycG0tZ3BnL1JQTS1HUEctS0VZLWZlZG9yYS0kcmVsZWFzZXZlci0kYmFzZWFyY2gKCltmZWRvcmEtZGVidWdpbmZvXQpuYW1lPUZlZG9yYSAkcmVsZWFzZXZlciAtICRiYXNlYXJjaCAtIERlYnVnCmZhaWxvdmVybWV0aG9kPXByaW9yaXR5CmJhc2V1cmw9aHR0cDovL2luZnJhc3RydWN0dXJlLmZlZG9yYXByb2plY3Qub3JnL3B1Yi9mZWRvcmEvbGludXgvcmVsZWFzZXMvJHJlbGVhc2V2ZXIvRXZlcnl0aGluZy8kYmFzZWFyY2gvZGVidWcvCiNtZXRhbGluaz1odHRwczovL21pcnJvcnMuZmVkb3JhcHJvamVjdC5vcmcvbWV0YWxpbms/cmVwbz1mZWRvcmEtZGVidWctJHJlbGVhc2V2ZXImYXJjaD0kYmFzZWFyY2gKZW5hYmxlZD0wCm1ldGFkYXRhX2V4cGlyZT03ZApncGdjaGVjaz0xCmdwZ2tleT1maWxlOi8vL2V0Yy9wa2kvcnBtLWdwZy9SUE0tR1BHLUtFWS1mZWRvcmEtJHJlbGVhc2V2ZXItJGJhc2VhcmNoCgpbZmVkb3JhLXNvdXJjZV0KbmFtZT1GZWRvcmEgJHJlbGVhc2V2ZXIgLSBTb3VyY2UKZmFpbG92ZXJtZXRob2Q9cHJpb3JpdHkKYmFzZXVybD1odHRwOi8vaW5mcmFzdHJ1Y3R1cmUuZmVkb3JhcHJvamVjdC5vcmcvcHViL2ZlZG9yYS9saW51eC9yZWxlYXNlcy8kcmVsZWFzZXZlci9FdmVyeXRoaW5nL3NvdXJjZS9TUlBNUy8KI21ldGFsaW5rPWh0dHBzOi8vbWlycm9ycy5mZWRvcmFwcm9qZWN0Lm9yZy9tZXRhbGluaz9yZXBvPWZlZG9yYS1zb3VyY2UtJHJlbGVhc2V2ZXImYXJjaD0kYmFzZWFyY2gKZW5hYmxlZD0wCm1ldGFkYXRhX2V4cGlyZT03ZApncGdjaGVjaz0xCmdwZ2tleT1maWxlOi8vL2V0Yy9wa2kvcnBtLWdwZy9SUE0tR1BHLUtFWS1mZWRvcmEtJHJlbGVhc2V2ZXItJGJhc2VhcmNoCg=='
       owner: root:root
@@ -71,7 +71,7 @@ write_files:
 BOOT_TIMEOUT = 60
 
 {# this is just in dev for now, testing before moving it anywhere else #}
-{% if deployment_type in ['dev'] %}
+{% if deployment_type in ['dev', 'stg'] %}
 # ram size, in MiB
 RAM = 6144
 

roles/taskotron/taskotron-client/templates/taskotron.yaml.j2

@@ -141,7 +141,7 @@ 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'] %}
+{% 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

roles/taskotron/taskotron-trigger/tasks/main.yml

@@ -42,18 +42,18 @@
 
 - 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']
+  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']
+  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']
+  when: deployment_type in ['dev', 'stg']
 
 - name: start and enable fedmsg-hub service
   service: name=fedmsg-hub enabled=yes state=started

roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2

@@ -15,7 +15,7 @@ job_logging = True
 joblog_file = {{ trigger_joblog_file }}
 fuse_delay = 900 ; 15 minutes in seconds
 
-{% if deployment_type in ['dev'] %}
+{% if deployment_type in ['dev', 'stg'] %}
 [distgit]
 cache_dir = {{ trigger_cache_dir }}
 repo_url = http://pkgs.fedoraproject.org/git