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 271a6c9846..e4286c649c 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 @@ -777,6 +777,34 @@ - console-log +- job-template: + name: '{pipeline}-grenade-dsvm-partial-ncpu' + node: '{node}' + + wrappers: + - timeout: + timeout: 125 + fail: true + - timestamps + + builders: + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 + export DEVSTACK_GATE_TEMPEST=0 + export DEVSTACK_GATE_GRENADE=1 + export DEVSTACK_GATE_GRENADE_PARTIAL_NCPU=1 + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + - link-logs + + publishers: + - devstack-logs + - console-log + + - job-template: name: '{pipeline}-tempest-dsvm-savanna-full{branch-designator}' node: '{node}' @@ -1067,6 +1095,7 @@ - '{pipeline}-grenade-dsvm-forward' - '{pipeline}-grenade-dsvm-neutron' - '{pipeline}-grenade-dsvm-neutron-forward' + - '{pipeline}-grenade-dsvm-partial-ncpu' - '{pipeline}-tempest-dsvm-savanna-full{branch-designator}' - '{pipeline}-tempest-dsvm-savanna-postgres{branch-designator}' - '{pipeline}-tempest-dsvm-savanna-neutron{branch-designator}' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 9f101acad2..b5d44174e5 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -272,6 +272,9 @@ jobs: - name: ^(gate|check)-grenade-dsvm-neutron$ branch: ^(?!stable/grizzly).*$ voting: false + - name: ^(gate|check)-grenade-dsvm-partial-ncpu$ + branch: ^(?!stable/(grizzly|havana)).*$ + voting: false - name: gate-tempest-python27 branch: ^(?!stable/grizzly).*$ # only here until stable is votable, then merge @@ -886,6 +889,7 @@ projects: - check-tempest-dsvm-cells-full - gate-nova-pylint - check-tempest-dsvm-neutron-heat-slow + - check-grenade-dsvm-partial-ncpu gate: - gate-nova-requirements - gate-devstack-dsvm-cells