Merge "Re-enable all three jobs for TripleO"

jenkins/jobs/projects.yaml

@@ -11265,6 +11265,20 @@
           branch-override: default
       # tripleo-ci is branchless, so we need to test changes against all the
       # stable branches as well.
+      - '{trigger}-tripleo-ci-{jobname}{suffix}':
+          jobname: 'centos-7-ovb-nonha-liberty'
+          suffix: ''
+          type: 'ovb-nonha'
+          node: 'tripleo-centos-7'
+          trigger: 'gate'
+          branch-override: 'stable/liberty'
+      - '{trigger}-tripleo-ci-{jobname}{suffix}':
+          jobname: 'centos-7-ovb-nonha-mitaka'
+          suffix: ''
+          type: 'ovb-nonha'
+          node: 'tripleo-centos-7'
+          trigger: 'gate'
+          branch-override: 'stable/mitaka'
       - '{trigger}-tripleo-ci-{jobname}{suffix}':
           jobname: 'centos-7-ovb-ha-liberty'
           suffix: ''

zuul/layout.yaml

@@ -1049,6 +1049,7 @@ project-templates:
   - name: check-tripleo-jobs
     check-tripleo:
       - gate-tripleo-ci-centos-7-ovb-ha
+      - gate-tripleo-ci-centos-7-ovb-nonha
     check:
       - gate-tripleo-ci-centos-7-nonha-multinode-nv
       - gate-tripleo-ci-centos-7-undercloud-nv
@@ -1056,6 +1057,7 @@ project-templates:
       - gate-tripleo-ci-centos-7-undercloud-upgrades-nv
       - gate-tripleo-ci-centos-7-nonha-multinode-updates-nv
       - gate-tripleo-ci-centos-7-nonha-multinode-upgrades-nv
+      - gate-tripleo-ci-centos-7-ovb-updates
 
   - name: experimental-tripleo-jobs
     experimental-tripleo:
@@ -4639,6 +4641,8 @@ projects:
       - name: noop-jobs
       - name: check-tripleo-jobs
     check-tripleo:
+      - gate-tripleo-ci-centos-7-ovb-nonha-liberty
+      - gate-tripleo-ci-centos-7-ovb-nonha-mitaka
       - gate-tripleo-ci-centos-7-ovb-ha-liberty
       - gate-tripleo-ci-centos-7-ovb-ha-mitaka
     periodic: