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 b1e2b5265d..b2cc3230ba 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 @@ -573,13 +573,13 @@ - console-log -- job: - name: gate-grenade-dsvm-stable - node: devstack-precise +- job-template: + name: '{pipeline}-grenade-dsvm-forward' + node: '{node}' wrappers: - timeout: - timeout: 180 + timeout: 60 fail: true - timestamps @@ -590,6 +590,7 @@ export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_GRENADE=1 + export DEVSTACK_GATE_GRENADE_FORWARD=1 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - link-logs @@ -721,6 +722,7 @@ - '{pipeline}-tempest-dsvm-neutron-heat-slow{branch-designator}' - '{pipeline}-tempest-dsvm-postgres-zeromq-full{branch-designator}' - '{pipeline}-grenade-dsvm' + - '{pipeline}-grenade-dsvm-forward' - '{pipeline}-tempest-dsvm-savanna-full{branch-designator}' - '{pipeline}-tempest-dsvm-savanna-postgres-full{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 3204ccba94..e2301c4c22 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -137,11 +137,9 @@ jobs: branch: ^(?!stable/grizzly).*$ # only here until stable is votable, then merge # back to a single job - - name: gate-grenade-dsvm-stable - branch: ^(stable/grizzly).*$ + - name: ^(gate|check)-grenade-dsvm-forward$ + branch: ^(stable/).*$ voting: false - # Remove when gate-grenade-dsvm-stable is - # merged into gate-grenade-dsvm - name: gate-grenade-noop branch: ^(stable/grizzly).*$ - name: gate-devstack-bash8 @@ -683,7 +681,7 @@ projects: - gate-tempest-dsvm-neutron-large-ops - gate-grenade-dsvm experimental: - - gate-grenade-dsvm-stable + - gate-grenade-dsvm-forward - gate-devstack-dsvm-cells post: - cinder-branch-tarball @@ -731,7 +729,7 @@ projects: - gate-tempest-dsvm-neutron-large-ops - gate-grenade-dsvm experimental: - - gate-grenade-dsvm-stable + - gate-grenade-dsvm-forward - gate-devstack-dsvm-cells post: - glance-branch-tarball @@ -782,7 +780,7 @@ projects: - gate-tempest-dsvm-neutron-large-ops - gate-grenade-dsvm experimental: - - gate-grenade-dsvm-stable + - gate-grenade-dsvm-forward - gate-devstack-dsvm-cells post: - horizon-branch-tarball @@ -853,7 +851,7 @@ projects: - gate-grenade-dsvm - gate-swift-dsvm-functional experimental: - - gate-grenade-dsvm-stable + - gate-grenade-dsvm-forward - gate-devstack-dsvm-cells post: - keystone-branch-tarball @@ -904,7 +902,7 @@ projects: - gate-tempest-dsvm-neutron-large-ops - gate-grenade-dsvm experimental: - - gate-grenade-dsvm-stable + - gate-grenade-dsvm-forward - gate-tempest-dsvm-neutron-full post: - nova-branch-tarball @@ -1177,7 +1175,7 @@ projects: - gate-tempest-dsvm-neutron-large-ops - gate-grenade-dsvm experimental: - - gate-grenade-dsvm-stable + - gate-grenade-dsvm-forward - gate-devstack-dsvm-cells post: - swift-branch-tarball @@ -1279,7 +1277,7 @@ projects: - gate-tempest-dsvm-neutron-large-ops - gate-grenade-dsvm experimental: - - gate-grenade-dsvm-stable + - gate-grenade-dsvm-forward - gate-devstack-dsvm-cells post: - python-cinderclient-branch-tarball @@ -1321,7 +1319,7 @@ projects: - gate-tempest-dsvm-neutron-large-ops - gate-grenade-dsvm experimental: - - gate-grenade-dsvm-stable + - gate-grenade-dsvm-forward - gate-devstack-dsvm-cells post: - python-glanceclient-branch-tarball @@ -1363,7 +1361,7 @@ projects: - gate-tempest-dsvm-neutron-large-ops - gate-grenade-dsvm experimental: - - gate-grenade-dsvm-stable + - gate-grenade-dsvm-forward - gate-devstack-dsvm-cells post: - python-keystoneclient-branch-tarball @@ -1408,7 +1406,7 @@ projects: - gate-tempest-dsvm-neutron-large-ops - gate-grenade-dsvm experimental: - - gate-grenade-dsvm-stable + - gate-grenade-dsvm-forward - gate-devstack-dsvm-cells post: - python-novaclient-branch-tarball @@ -1485,7 +1483,7 @@ projects: - gate-tempest-dsvm-neutron-large-ops - gate-grenade-dsvm experimental: - - gate-grenade-dsvm-stable + - gate-grenade-dsvm-forward - gate-devstack-dsvm-cells post: - python-neutronclient-branch-tarball @@ -1570,11 +1568,11 @@ projects: check: - gate-grenade-noop - check-grenade-dsvm + - check-grenade-dsvm-forward gate: - gate-grenade-noop - gate-grenade-dsvm - experimental: - - gate-grenade-dsvm-stable + - gate-grenade-dsvm-forward - name: openstack-dev/cookiecutter check: @@ -1671,6 +1669,7 @@ projects: - gate-tempest-dsvm-large-ops - gate-tempest-dsvm-neutron-large-ops - check-grenade-dsvm + - check-grenade-dsvm-forward - check-swift-dsvm-functional gate: - gate-devstack-bash8 @@ -1680,10 +1679,11 @@ projects: - gate-tempest-dsvm-large-ops - gate-tempest-dsvm-neutron-large-ops - gate-grenade-dsvm + - gate-grenade-dsvm-forward - gate-swift-dsvm-functional experimental: - gate-tempest-dsvm-neutron-heat-slow - - gate-grenade-dsvm-stable + - gate-grenade-dsvm-forward - gate-devstack-dsvm-cells - name: openstack-infra/elastic-recheck @@ -1726,7 +1726,7 @@ projects: - gate-grenade-dsvm - gate-swift-dsvm-functional experimental: - - gate-grenade-dsvm-stable + - gate-grenade-dsvm-forward - gate-devstack-dsvm-cells # This is not strictly necessary; there is currently a transitive @@ -1773,7 +1773,7 @@ projects: - gate-grenade-dsvm experimental: - gate-tempest-dsvm-neutron-heat-slow - - gate-grenade-dsvm-stable + - gate-grenade-dsvm-forward - gate-devstack-dsvm-cells - gate-tempest-dsvm-neutron-full post: