make ceph-ansible-pull-requests request nodes specific to the job

When the labels were more generic other jobs would pick them up and run
the risk of being destroyed by the ceph-ansible-pull-requests job after
a run. There was also an issue were jobs that didn't need a node with an
extra device would provision one of the 'unique' nodes because the
labels also included 'small' and 'trusty'. Making the labels this
specific ensures that only this job will use those node types.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/ceph-ansible-pull-requests/config/definitions/ceph-ansible-pull-requests.yml b/ceph-ansible-pull-requests/config/definitions/ceph-ansible-pull-requests.yml
index 9982f50348577aaee8c4765d2251fa37eedbe847..38ae3597d924257bf7b5ee491ce02164f4c0d233 100644 (file)
--- a/ceph-ansible-pull-requests/config/definitions/ceph-ansible-pull-requests.yml
+++ b/ceph-ansible-pull-requests/config/definitions/ceph-ansible-pull-requests.yml
@@ -25,22 +25,12 @@
       - github:
           url: https://github.com/ceph/ceph-ansible
     axes:
-      - axis:
-          type: label-expression
-          name: MACHINE_SIZE
-          values:
-            - small
-      - axis:
-          type: label-expression
-          name: UNIQUE
-          values:
-            - unique
       - axis:
           type: label-expression
           name: DIST
           values:
-            - trusty
-            - centos7
+            - ceph_ansible_pr_trusty
+            - ceph_ansible_pr_centos7
     logrotate:
       daysToKeep: 15
       numToKeep: 30