diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index 4baa781595..d725ba1011 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -1185,6 +1185,70 @@ - console-log +- job-template: + name: '{pipeline}-grenade-dsvm-ironic-sideways{branch-designator}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 130 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 + export DEVSTACK_GATE_TEMPEST=0 + export DEVSTACK_GATE_GRENADE=sideways + export DEVSTACK_GATE_IRONIC=1 + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + + publishers: + - devstack-logs + - console-log + + +- job-template: + name: '{pipeline}-grenade-dsvm-neutron-sideways{branch-designator}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 130 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 + export DEVSTACK_GATE_TEMPEST=0 + export DEVSTACK_GATE_GRENADE=sideways + export DEVSTACK_GATE_NEUTRON=1 + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + + publishers: + - devstack-logs + - console-log + + - job-template: name: '{pipeline}-tempest-dsvm-all{branch-designator}' node: '{node}' @@ -1479,6 +1543,8 @@ - '{pipeline}-grenade-dsvm-neutron{branch-designator}' - '{pipeline}-grenade-dsvm-neutron-forward{branch-designator}' - '{pipeline}-grenade-dsvm-partial-ncpu{branch-designator}' + - '{pipeline}-grenade-dsvm-ironic-sideways{branch-designator}' + - '{pipeline}-grenade-dsvm-neutron-sideways{branch-designator}' - '{pipeline}-tempest-dsvm-ironic{branch-designator}' - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}' - '{pipeline}-tempest-dsvm-virtual-ironic{branch-designator}' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 2a7f44674e..8caf4845f5 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -1033,6 +1033,8 @@ projects: - gate-tempest-dsvm-ironic - gate-tempest-dsvm-ironic-postgres - gate-tempest-dsvm-virtual-ironic + experimental: + - check-grenade-dsvm-ironic-sideways pre-release: - ironic-tarball release: @@ -1163,6 +1165,7 @@ projects: - check-neutron-dsvm-api - gate-grenade-dsvm-neutron-forward - check-tempest-dsvm-neutron-dvr + - check-grenade-dsvm-neutron-sideways experimental-tripleo: - check-tripleo-novabm-undercloud-precise-nonha - check-tripleo-ironic-undercloud-precise-nonha @@ -2700,6 +2703,8 @@ projects: - gate-grenade-dsvm-partial-ncpu experimental: - gate-grenade-dsvm-neutron-forward + - check-grenade-dsvm-ironic-sideways + - check-grenade-dsvm-neutron-sideways - name: openstack-dev/hacking template: @@ -2895,6 +2900,8 @@ projects: - check-tempest-dsvm-aiopcpu - check-tempest-dsvm-neutron-aiopcpu - check-tempest-dsvm-centos7 + - check-grenade-dsvm-ironic-sideways + - check-grenade-dsvm-neutron-sideways experimental-tripleo: - check-tripleo-novabm-undercloud-precise-nonha - check-tripleo-ironic-undercloud-precise-nonha