diff options
| author | Martin Krizek <mkrizek@redhat.com> | 2017-03-10 12:06:11 +0000 |
|---|---|---|
| committer | Martin Krizek <mkrizek@redhat.com> | 2017-03-10 12:07:20 +0000 |
| commit | d2d05612bea3ca185448ab9e52c9ca8acfced445 (patch) | |
| tree | e3ad56212d747bfbe41d92cd5b32da117c502025 | |
| parent | c2c6e6bb733e65d3e1aed3e3d392437e7e296bcf (diff) | |
| download | ansible-d2d05612bea3ca185448ab9e52c9ca8acfced445.tar.gz ansible-d2d05612bea3ca185448ab9e52c9ca8acfced445.tar.xz ansible-d2d05612bea3ca185448ab9e52c9ca8acfced445.zip | |
taskotron-dev: add upstream-atomic and fedora-cloud-tests
| -rw-r--r-- | inventory/group_vars/taskotron-dev | 2 | ||||
| -rw-r--r-- | roles/taskotron/taskotron-client/templates/namespaces.yaml.j2 | 2 | ||||
| -rw-r--r-- | roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 | 12 |
3 files changed, 16 insertions, 0 deletions
diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index 558f3b15b..88dd3af1f 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -33,6 +33,8 @@ grokmirror_repos: - { name: fedoraqa/check_modulemd, url: 'https://github.com/fedora-modularity/check_modulemd'} - { name: fedoraqa/rpmdeplint, url: 'https://pagure.io/taskotron/task-rpmdeplint.git'} - { name: fedoraqa/rpmlint-scratch, url: 'https://bitbucket.org/fedoraqa/task-rpmlint-scratch.git'} + - { name: fedoraqa/upstream-atomic, url: 'https://pagure.io/taskotron/task-upstream-atomic.git'} + - { name: fedoraqa/fedora-cloud-tests, url: 'https://pagure.io/taskotron/task-fedora-cloud-tests.git'} grokmirror_default_branch: develop diff --git a/roles/taskotron/taskotron-client/templates/namespaces.yaml.j2 b/roles/taskotron/taskotron-client/templates/namespaces.yaml.j2 index 44e424a96..91e7c3df5 100644 --- a/roles/taskotron/taskotron-client/templates/namespaces.yaml.j2 +++ b/roles/taskotron/taskotron-client/templates/namespaces.yaml.j2 @@ -15,6 +15,8 @@ namespaces_whitelist: - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/python-versions/ - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/check_modulemd/ - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/rpmdeplint/ + - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/upstream-atomic/ + - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/fedora-cloud-tests/ pkg: # The directory used to be called rpms-checks - git://pkgs.fedoraproject.org/rpms-checks/ diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 index f84effb24..6f9948f55 100644 --- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 +++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 @@ -49,3 +49,15 @@ do: - {discover: {repo: '{{ trigger_distgit_repo_url }}/rpms/${name}.git', branch: "${distgit_branch}", fallback_branch: 'master', recursive: true}} {% endif %} + +{% if deployment_type in ['dev'] %} +- when: + message_type: AtomicCompose + do: + - {tasks: [upstream-atomic, fedora-cloud-tests]} + +- when: + message_type: CloudCompose + do: + - {tasks: [fedora-cloud-tests]} +{% endif %} |