diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 24daabe1ad..0c44c9627d 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -1971,31 +1971,44 @@ type: 'nonha' node: 'tripleo-f21' trigger: 'gate' + branch-override: default - '{trigger}-tripleo-ci-{jobname}': jobname: 'f21-ha' type: 'ha' node: 'tripleo-f21' trigger: 'gate' + branch-override: default - '{trigger}-tripleo-ci-{jobname}': jobname: 'f21-ceph' type: 'ceph' node: 'tripleo-f21' trigger: 'gate' + branch-override: default - '{trigger}-tripleo-ci-{jobname}': jobname: 'f22-nonha' type: 'periodic-nonha' node: 'tripleo-f22' trigger: 'periodic' + branch-override: default - '{trigger}-tripleo-ci-{jobname}': jobname: 'f22-ha' type: 'periodic-ha' node: 'tripleo-f22' trigger: 'periodic' + branch-override: default - '{trigger}-tripleo-ci-{jobname}': jobname: 'f22-ceph' type: 'periodic-ceph' node: 'tripleo-f22' trigger: 'periodic' + branch-override: default + - '{trigger}-tripleo-ci-{jobname}': + jobname: 'f22-ha-liberty' + type: 'periodic-ha-liberty' + node: 'tripleo-f22' + trigger: 'periodic' + branch-override: stable/liberty + - project: name: ironic-inspector diff --git a/jenkins/jobs/tripleo.yaml b/jenkins/jobs/tripleo.yaml index 696a40edef..a252a94b0d 100644 --- a/jenkins/jobs/tripleo.yaml +++ b/jenkins/jobs/tripleo.yaml @@ -19,6 +19,11 @@ export ZUUL_BRANCH=${{ZUUL_BRANCH:-master}} export ZUUL_REF=${{ZUUL_REF:-None}} + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TIMEOUT=170 export DEVSTACK_GATE_TEMPEST=0 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 8f3cacd151..5b47a1cab7 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3437,6 +3437,7 @@ projects: - periodic-tripleo-ci-f22-ceph - periodic-tripleo-ci-f22-ha - periodic-tripleo-ci-f22-nonha + - periodic-tripleo-ci-f22-ha-liberty - name: openstack-infra/trystack-site template: