diff --git a/jenkins/jobs/ironic.yaml b/jenkins/jobs/ironic.yaml index 16e9aafc12..5624fb9d0f 100644 --- a/jenkins/jobs/ironic.yaml +++ b/jenkins/jobs/ironic.yaml @@ -1062,3 +1062,50 @@ publishers: - devstack-logs - console-log + +- job-template: + name: '{pipeline}-ironic-dsvm-multitest{job-suffix}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 180 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PROJECTS="openstack/ironic $PROJECTS" + export PROJECTS="openstack/ironic-lib $PROJECTS" + export PROJECTS="openstack/ironic-python-agent $PROJECTS" + export PROJECTS="openstack/python-ironicclient $PROJECTS" + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_IRONIC=1 + export DEVSTACK_GATE_NEUTRON=1 + export DEVSTACK_GATE_VIRT_DRIVER=ironic + # The tests will be launched by devstack/exercise.sh + export DEVSTACK_GATE_TEMPEST_NOTESTS=1 + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + + export DEVSTACK_LOCAL_CONFIG="enable_plugin ironic git://git.openstack.org/openstack/ironic" + + function post_test_hook {{ + source $BASE/new/devstack/openrc admin admin + cd /opt/stack/new/ironic + source ./devstack/exercise.sh + }} + export -f post_test_hook + + 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 diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 3b8eb0b219..528c09a1c6 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -5379,6 +5379,11 @@ node: ubuntu-trusty job-suffix: '-nv' branch-override: default + - '{pipeline}-ironic-dsvm-multitest{job-suffix}': + pipeline: gate + node: ubuntu-xenial + job-suffix: '-nv' + branch-override: default - periodic-python-jobs-with-oslo-master - project: diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 73dd307a92..db6052136c 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -9818,6 +9818,7 @@ projects: - gate-tempest-dsvm-ironic-parallel-nv - gate-tempest-dsvm-ironic-pxe_ipa-full-nv - gate-tempest-dsvm-ironic-ipa-wholedisk-agent_ssh-tinyipa-multinode-nv + - gate-ironic-dsvm-multitest-nv - name: openstack/ironic-inspector template: