Remove redundant sections of tripleo job names

All the tripleo jobs are now using ironic, puppet and deploying
an overcloud so remove these parts of the jobs names as the no
longer serve any purpose distinguishing between jobs.

Change-Id: I4a891159f2313ec70651e4db45f57e0f9c778a31

jenkins/jobs/projects.yaml

@@ -2023,16 +2023,16 @@
           branch-designator: '-nv'
           branch-override: default
       - 'gate-tripleo-ci-{jobname}':
-          jobname: 'ironic-overcloud-f21puppet-nonha'
-          type: 'overcloud-f21puppet-nonha'
+          jobname: 'f21-nonha'
+          type: 'nonha'
           node: 'tripleo-f21'
       - 'gate-tripleo-ci-{jobname}':
-          jobname: 'ironic-overcloud-f21puppet-ha'
-          type: 'overcloud-f21puppet-ha'
+          jobname: 'f21-ha'
+          type: 'ha'
           node: 'tripleo-f21'
       - 'gate-tripleo-ci-{jobname}':
-          jobname: 'ironic-overcloud-f21puppet-ceph'
-          type: 'overcloud-f21puppet-ceph'
+          jobname: 'f21-ceph'
+          type: 'ceph'
           node: 'tripleo-f21'
 
 - project:

zuul/layout.yaml

@@ -600,13 +600,13 @@ project-templates:
 
   - name: check-tripleo-jobs
     check-tripleo:
-      - gate-tripleo-ci-ironic-overcloud-f21puppet-ceph
-      - gate-tripleo-ci-ironic-overcloud-f21puppet-ha
-      - gate-tripleo-ci-ironic-overcloud-f21puppet-nonha
+      - gate-tripleo-ci-f21-ceph
+      - gate-tripleo-ci-f21-ha
+      - gate-tripleo-ci-f21-nonha
 
   - name: experimental-tripleo-jobs
     experimental-tripleo:
-      - gate-tripleo-ci-ironic-overcloud-f21puppet-nonha
+      - gate-tripleo-ci-f21-nonha
 
   - name: javascript-jobs
     check:
@@ -4156,7 +4156,7 @@ projects:
       - gate-dib-dsvm-functests-devstack-f21
       - gate-tempest-dsvm-ironic-pxe_ssh-dib
     check-tripleo:
-      - gate-tripleo-ci-ironic-overcloud-f21puppet-nonha
+      - gate-tripleo-ci-f21-nonha
     gate:
       - gate-dib-dsvm-functests-devstack-trusty
       - gate-dib-dsvm-functests-devstack-centos7
@@ -4179,7 +4179,7 @@ projects:
       - gate-dib-dsvm-functests-devstack-f21
       - gate-tempest-dsvm-ironic-pxe_ssh-dib
     check-tripleo:
-      - gate-tripleo-ci-ironic-overcloud-f21puppet-nonha
+      - gate-tripleo-ci-f21-nonha
     gate:
       - gate-dib-dsvm-functests-devstack-trusty
       - gate-dib-dsvm-functests-devstack-centos7
@@ -6874,7 +6874,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-openstack-integration-jobs
     check-tripleo:
-      - gate-tripleo-ci-ironic-overcloud-f21puppet-nonha
+      - gate-tripleo-ci-f21-nonha
 
   - name: openstack/puppet-ceph
     template:
@@ -6891,7 +6891,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-openstack-integration-jobs
     check-tripleo:
-      - gate-tripleo-ci-ironic-overcloud-f21puppet-nonha
+      - gate-tripleo-ci-f21-nonha
 
   - name: openstack/puppet-designate
     template:
@@ -6908,7 +6908,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-openstack-integration-jobs
     check-tripleo:
-      - gate-tripleo-ci-ironic-overcloud-f21puppet-nonha
+      - gate-tripleo-ci-f21-nonha
 
   - name: openstack/puppet-gnocchi
     template:
@@ -6925,7 +6925,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-openstack-integration-jobs
     check-tripleo:
-      - gate-tripleo-ci-ironic-overcloud-f21puppet-nonha
+      - gate-tripleo-ci-f21-nonha
 
   - name: openstack/puppet-horizon
     template:
@@ -6950,7 +6950,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-openstack-integration-jobs
     check-tripleo:
-      - gate-tripleo-ci-ironic-overcloud-f21puppet-nonha
+      - gate-tripleo-ci-f21-nonha
 
   - name: openstack/puppet-manila
     template:
@@ -6997,7 +6997,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-openstack-integration-jobs
     check-tripleo:
-      - gate-tripleo-ci-ironic-overcloud-f21puppet-nonha
+      - gate-tripleo-ci-f21-nonha
 
   - name: openstack/puppet-nova
     template:
@@ -7007,7 +7007,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-openstack-integration-jobs
     check-tripleo:
-      - gate-tripleo-ci-ironic-overcloud-f21puppet-nonha
+      - gate-tripleo-ci-f21-nonha
 
   - name: openstack/puppet-openstack-cookiecutter
     template:
@@ -7054,7 +7054,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-openstack-integration-jobs
     check-tripleo:
-      - gate-tripleo-ci-ironic-overcloud-f21puppet-nonha
+      - gate-tripleo-ci-f21-nonha
 
   - name: openstack/puppet-sahara
     template:
@@ -7082,7 +7082,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-openstack-integration-jobs
     check-tripleo:
-      - gate-tripleo-ci-ironic-overcloud-f21puppet-nonha
+      - gate-tripleo-ci-f21-nonha
 
   - name: openstack/puppet-tempest
     template: