diff --git a/jenkins/jobs/windmill.yaml b/jenkins/jobs/windmill.yaml index 61ed0ef6d0..cabe7a1184 100644 --- a/jenkins/jobs/windmill.yaml +++ b/jenkins/jobs/windmill.yaml @@ -18,12 +18,13 @@ - job-template: name: '{pipeline}-windmill-{scenario}-{ostype}{job-suffix}' - node: 'devstack-{ostype}' + node: '{ostype}' builders: - print-template-name: template-name: "{template-name}" - windmill-checkout + - install-distro-packages - shell: | # Allow Jenkins user to ssh into localhost ssh-keygen -f ~/.ssh/id_rsa -N "" @@ -42,16 +43,16 @@ - '{pipeline}-windmill-{scenario}-{ostype}{job-suffix}': job-suffix: '-nv' ostype: - - centos7 - - trusty + - devstack-centos7 + - ubuntu-trusty pipeline: gate scenario: - deploy - '{pipeline}-windmill-{scenario}-{ostype}{job-suffix}': job-suffix: '' ostype: - - centos7 - - trusty + - devstack-centos7 + - ubuntu-trusty pipeline: gate scenario: - deploy diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 0230cc0cca..baa7e1abb8 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -730,23 +730,23 @@ project-templates: - name: windmill-jobs-centos7 check: - - 'gate-windmill-deploy-centos7' + - 'gate-windmill-deploy-devstack-centos7' gate: - - 'gate-windmill-deploy-centos7' + - 'gate-windmill-deploy-devstack-centos7' - name: windmill-jobs-centos7-nv check: - - 'gate-windmill-deploy-centos7-nv' + - 'gate-windmill-deploy-devstack-centos7-nv' - name: windmill-jobs-trusty check: - - 'gate-windmill-deploy-trusty' + - 'gate-windmill-deploy-ubuntu-trusty' gate: - - 'gate-windmill-deploy-trusty' + - 'gate-windmill-deploy-ubuntu-trusty' - name: windmill-jobs-trusty-nv check: - - 'gate-windmill-deploy-trusty-nv' + - 'gate-windmill-deploy-ubuntu-trusty-nv' jobs: