From b702f0f792b60be81709680157b9e67e4dcb425d Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Wed, 26 Mar 2014 14:50:03 -0400 Subject: [PATCH] Change names for duplicate neutron jobs This commit adds a *-2 neutron jobs to be used for running duplicate jobs for proposed changes to neutron. Originally duplicate jobs with the same name were used which were added in change: I33eda4b22505864fb7b609c90703df5fbddf9d71 however there is an issue with reporting with the jobs names duplicated like that. This works around the issue by changing the name of the duplicate job. Change-Id: Iae6980777d6da78f74bf35a4378da7a29acfc336 --- .../jenkins_job_builder/config/devstack-gate.yaml | 2 -- .../files/jenkins_job_builder/config/projects.yaml | 10 ++++++++++ modules/openstack_project/files/zuul/layout.yaml | 8 ++++---- 3 files changed, 14 insertions(+), 6 deletions(-) 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 2c1930dff1..9005a80393 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 @@ -1321,9 +1321,7 @@ - '{pipeline}-tempest-dsvm-neutron{branch-designator}' - '{pipeline}-tempest-master-dsvm-neutron{branch-designator}' - '{pipeline}-tempest-dsvm-neutron-pg{branch-designator}' - - '{pipeline}-tempest-dsvm-neutron-isolated{branch-designator}' - '{pipeline}-tempest-dsvm-neutron-isolated-parallel{branch-designator}' - - '{pipeline}-tempest-dsvm-neutron-pg-isolated{branch-designator}' - '{pipeline}-tempest-dsvm-neutron-full{branch-designator}' - '{pipeline}-devstack-dsvm-cells{branch-designator}' - '{pipeline}-tempest-dsvm-cells{branch-designator}' diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index 04607468a6..dde7bf8eb7 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -1000,6 +1000,16 @@ node: 'devstack-precise || devstack-precise-check' branch-designator: '' branch-override: default + - devstack-jobs: + pipeline: gate + node: devstack-precise + branch-designator: '-2' + branch-override: default + - devstack-jobs: + pipeline: check + node: 'devstack-precise || devstack-precise-check' + branch-designator: '-2' + branch-override: default - project: diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 77dfa237b5..b72fb22db4 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -872,11 +872,11 @@ projects: - name: integrated-gate-neutron check: - check-neutron-dsvm-functional - - check-tempest-dsvm-neutron - - check-tempest-dsvm-neutron-pg + - check-tempest-dsvm-neutron-2 + - check-tempest-dsvm-neutron-pg-2 gate: - - gate-tempest-dsvm-neutron - - gate-tempest-dsvm-neutron-pg + - gate-tempest-dsvm-neutron-2 + - gate-tempest-dsvm-neutron-pg-2 experimental: - check-neutron-dsvm-api - gate-grenade-dsvm-neutron-forward