diff --git a/grafana/nodepool-bluebox.yaml b/grafana/nodepool-bluebox.yaml index a465797862..2f50912e76 100644 --- a/grafana/nodepool-bluebox.yaml +++ b/grafana/nodepool-bluebox.yaml @@ -181,7 +181,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.devstack-trusty.bluebox-sjc1.runtime.mean, '0.001'), 'SJC1') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.bluebox-sjc1.runtime.mean, '0.001'), 'SJC1') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -190,4 +190,4 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.devstack-trusty.bluebox-sjc1.runtime.mean, '0.001'), 'SJC1') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.bluebox-sjc1.runtime.mean, '0.001'), 'SJC1') diff --git a/grafana/nodepool-infracloud.yaml b/grafana/nodepool-infracloud.yaml index a1189c54d1..8f8a491e72 100644 --- a/grafana/nodepool-infracloud.yaml +++ b/grafana/nodepool-infracloud.yaml @@ -136,7 +136,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.devstack-trusty.infracloud-west.runtime.mean, '0.001'), 'WEST') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.infracloud-west.runtime.mean, '0.001'), 'WEST') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -145,4 +145,4 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.devstack-trusty.infracloud-west.runtime.mean, '0.001'), 'WEST') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.infracloud-west.runtime.mean, '0.001'), 'WEST') diff --git a/grafana/nodepool-internap.yaml b/grafana/nodepool-internap.yaml index da315d7b5d..6115f5f707 100644 --- a/grafana/nodepool-internap.yaml +++ b/grafana/nodepool-internap.yaml @@ -136,7 +136,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.devstack-trusty.internap-nyj01.runtime.mean, '0.001'), 'NYJ01') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.internap-nyj01.runtime.mean, '0.001'), 'NYJ01') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -145,4 +145,4 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.devstack-trusty.internap-nyj01.runtime.mean, '0.001'), 'NYJ01') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.internap-nyj01.runtime.mean, '0.001'), 'NYJ01') diff --git a/grafana/nodepool-osic.yaml b/grafana/nodepool-osic.yaml index e62d3ff909..bf0e54e473 100644 --- a/grafana/nodepool-osic.yaml +++ b/grafana/nodepool-osic.yaml @@ -181,7 +181,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.devstack-trusty.osic-cloud1.runtime.mean, '0.001'), 'Cloud 1') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.osic-cloud1.runtime.mean, '0.001'), 'Cloud 1') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -190,4 +190,4 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.devstack-trusty.osic-cloud1.runtime.mean, '0.001'), 'Cloud 1') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.osic-cloud1.runtime.mean, '0.001'), 'Cloud 1') diff --git a/grafana/nodepool-ovh.yaml b/grafana/nodepool-ovh.yaml index 7d15403bd8..2e33bd7e38 100644 --- a/grafana/nodepool-ovh.yaml +++ b/grafana/nodepool-ovh.yaml @@ -172,8 +172,8 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.devstack-trusty.ovh-bhs1.runtime.mean, '0.001'), 'BHS1') - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.devstack-trusty.ovh-gra1.runtime.mean, '0.001'), 'GRA1') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.ovh-bhs1.runtime.mean, '0.001'), 'BHS1') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.ovh-gra1.runtime.mean, '0.001'), 'GRA1') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -182,5 +182,5 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.devstack-trusty.ovh-bhs1.runtime.mean, '0.001'), 'BHS1') - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.devstack-trusty.ovh-gra1.runtime.mean, '0.001'), 'GRA1') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.ovh-bhs1.runtime.mean, '0.001'), 'BHS1') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.ovh-gra1.runtime.mean, '0.001'), 'GRA1') diff --git a/grafana/nodepool-rax-experimental.yaml b/grafana/nodepool-rax-experimental.yaml index 30a14e7283..b8fd86f284 100644 --- a/grafana/nodepool-rax-experimental.yaml +++ b/grafana/nodepool-rax-experimental.yaml @@ -175,7 +175,7 @@ dashboard: - s - none targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.devstack-trusty.$provider.runtime.mean, '0.001'), 7), 'rax-', '') + - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.$provider.runtime.mean, '0.001'), 7), 'rax-', '') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -184,4 +184,4 @@ dashboard: - s - none targets: - - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.devstack-trusty.$provider.runtime.mean, '0.001'), 7), 'rax-', '') + - target: aliasSub(aliasByNode(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.$provider.runtime.mean, '0.001'), 7), 'rax-', '') diff --git a/grafana/nodepool-rax.yaml b/grafana/nodepool-rax.yaml index 3d34461cbb..e10f6be0b9 100644 --- a/grafana/nodepool-rax.yaml +++ b/grafana/nodepool-rax.yaml @@ -180,9 +180,9 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.devstack-trusty.rax-dfw.runtime.mean, '0.001'), 'DFW') - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.devstack-trusty.rax-iad.runtime.mean, '0.001'), 'IAD') - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.devstack-trusty.rax-ord.runtime.mean, '0.001'), 'ORD') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.rax-dfw.runtime.mean, '0.001'), 'DFW') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.rax-iad.runtime.mean, '0.001'), 'IAD') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.rax-ord.runtime.mean, '0.001'), 'ORD') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -191,6 +191,6 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.devstack-trusty.rax-dfw.runtime.mean, '0.001'), 'DFW') - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.devstack-trusty.rax-iad.runtime.mean, '0.001'), 'IAD') - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.devstack-trusty.rax-ord.runtime.mean, '0.001'), 'ORD') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.rax-dfw.runtime.mean, '0.001'), 'DFW') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.rax-iad.runtime.mean, '0.001'), 'IAD') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.rax-ord.runtime.mean, '0.001'), 'ORD') diff --git a/grafana/nodepool-vexxhost.yaml b/grafana/nodepool-vexxhost.yaml index b17821da55..8e92b3e4f8 100644 --- a/grafana/nodepool-vexxhost.yaml +++ b/grafana/nodepool-vexxhost.yaml @@ -136,7 +136,7 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.devstack-trusty.vexxhost-ca-ymq-1.runtime.mean, '0.001'), 'YMQ') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.vexxhost-ca-ymq-1.runtime.mean, '0.001'), 'YMQ') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -145,4 +145,4 @@ dashboard: - s - none targets: - - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.devstack-trusty.vexxhost-ca-ymq-1.runtime.mean, '0.001'), 'YMQ') + - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.vexxhost-ca-ymq-1.runtime.mean, '0.001'), 'YMQ') diff --git a/grafana/nodepool.yaml b/grafana/nodepool.yaml index 9edf34d97f..719f087edf 100644 --- a/grafana/nodepool.yaml +++ b/grafana/nodepool.yaml @@ -86,7 +86,7 @@ dashboard: - s - none targets: - - target: alias(scale(averageSeries(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.devstack-trusty.runtime.mean), '0.001'), 'Average') + - target: alias(scale(averageSeries(stats.timers.nodepool.job.gate-tempest-dsvm-full.master.ubuntu-trusty.runtime.mean), '0.001'), 'Average') - title: gate-tempest-dsvm-neutron-full type: graph span: 6 @@ -95,4 +95,4 @@ dashboard: - s - none targets: - - target: alias(scale(averageSeries(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.devstack-trusty.runtime.mean), '0.001'), 'Average') + - target: alias(scale(averageSeries(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full.master.ubuntu-trusty.runtime.mean), '0.001'), 'Average') diff --git a/jenkins/jobs/app-catalog.yaml b/jenkins/jobs/app-catalog.yaml index 857e5495a5..af392c2670 100644 --- a/jenkins/jobs/app-catalog.yaml +++ b/jenkins/jobs/app-catalog.yaml @@ -14,7 +14,7 @@ - job: name: gate-app-catalog-ui-dsvm-integration - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/barbican.yaml b/jenkins/jobs/barbican.yaml index fb4c1fdcb4..5387c6504f 100644 --- a/jenkins/jobs/barbican.yaml +++ b/jenkins/jobs/barbican.yaml @@ -1,6 +1,6 @@ - job: name: gate-barbican-devstack-dsvm-oldstable - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -80,7 +80,7 @@ - job: name: gate-barbican-devstack-dsvm - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/blazar.yaml b/jenkins/jobs/blazar.yaml index 41e9832134..4a90bd7b0d 100644 --- a/jenkins/jobs/blazar.yaml +++ b/jenkins/jobs/blazar.yaml @@ -1,6 +1,6 @@ - job: name: gate-blazar-devstack-dsvm - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/castellan.yaml b/jenkins/jobs/castellan.yaml index dba50f20b3..09049fcbb1 100644 --- a/jenkins/jobs/castellan.yaml +++ b/jenkins/jobs/castellan.yaml @@ -1,6 +1,6 @@ - job: name: gate-castellan-dsvm-functional - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/ceilometer.yaml b/jenkins/jobs/ceilometer.yaml index dbb9b6c559..50b11fe1a5 100644 --- a/jenkins/jobs/ceilometer.yaml +++ b/jenkins/jobs/ceilometer.yaml @@ -184,7 +184,7 @@ - job-template: name: 'gate-telemetry-dsvm-integration-{name}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/cue.yaml b/jenkins/jobs/cue.yaml index e69bdbb36f..c6c395158e 100644 --- a/jenkins/jobs/cue.yaml +++ b/jenkins/jobs/cue.yaml @@ -1,6 +1,6 @@ - job-template: name: 'gate-cue-integration-dsvm-{broker}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index c6d1d5adf4..96681f02f3 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -2371,7 +2371,7 @@ # released library version. - job-template: name: '{pipeline}-tempest-dsvm-full-{plugin}-src-{srcname}{job-suffix}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -2405,7 +2405,7 @@ # tempest suite with their project/plugin enabled. - job-template: name: '{pipeline}-tempest-dsvm-full-{plugin}{job-suffix}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -2472,7 +2472,7 @@ # Runs the full tempest suite. - job-template: name: '{pipeline}-tempest-dsvm-full-drbd-devstack{job-suffix}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/ec2-api.yaml b/jenkins/jobs/ec2-api.yaml index 85f0dc1e71..be6fdcfe1c 100644 --- a/jenkins/jobs/ec2-api.yaml +++ b/jenkins/jobs/ec2-api.yaml @@ -52,7 +52,7 @@ - job: name: 'ec2-api-functional-neutron-dsvm-full' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -91,7 +91,7 @@ - job: name: 'ec2-api-rally-dsvm-fakevirt' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/freezer.yaml b/jenkins/jobs/freezer.yaml index 7769da4887..96b000abc8 100644 --- a/jenkins/jobs/freezer.yaml +++ b/jenkins/jobs/freezer.yaml @@ -1,6 +1,6 @@ - job: name: gate-freezer-devstack-dsvm - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -41,7 +41,7 @@ - job: name: gate-freezer-web-ui-devstack-dsvm - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -79,7 +79,7 @@ - job: name: gate-freezer-api-devstack-dsvm - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/heat.yaml b/jenkins/jobs/heat.yaml index b2ab2336df..c86d4ae1b5 100644 --- a/jenkins/jobs/heat.yaml +++ b/jenkins/jobs/heat.yaml @@ -1,6 +1,6 @@ - job: name: gate-heat-templates-dsvm - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/horizon.yaml b/jenkins/jobs/horizon.yaml index d9024a995c..c534f581ab 100644 --- a/jenkins/jobs/horizon.yaml +++ b/jenkins/jobs/horizon.yaml @@ -14,7 +14,7 @@ - job: name: gate-horizon-dsvm-integration - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/manila.yaml b/jenkins/jobs/manila.yaml index eacf7a0188..e141c5692d 100644 --- a/jenkins/jobs/manila.yaml +++ b/jenkins/jobs/manila.yaml @@ -1,6 +1,6 @@ - job-template: name: 'gate-manila-tempest-dsvm-{description}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -69,7 +69,7 @@ - job: name: 'gate-manila-tempest-minimal-dsvm-lvm' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -129,7 +129,7 @@ - job: name: gate-manilaclient-dsvm-neutron-functional - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -176,7 +176,7 @@ - job-template: name: 'gate-manila-publishimage-{image-name}' - node: devstack-trusty + node: ubuntu-trusty builders: - link-logs @@ -202,7 +202,7 @@ - job-template: name: 'gate-manila-buildimage-{image-name}' - node: devstack-trusty + node: ubuntu-trusty builders: - link-logs @@ -217,7 +217,7 @@ - job: name: gate-manila-tempest-dsvm-glusterfs - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -274,7 +274,7 @@ - job: name: gate-manila-tempest-dsvm-glusterfs-native - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -331,7 +331,7 @@ - job: name: gate-manila-tempest-dsvm-hdfs - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -380,7 +380,7 @@ - job: name: gate-manila-tempest-dsvm-cephfs-native - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/monasca.yaml b/jenkins/jobs/monasca.yaml index ac1fe840ec..d0a45ed66a 100644 --- a/jenkins/jobs/monasca.yaml +++ b/jenkins/jobs/monasca.yaml @@ -1,6 +1,6 @@ - job: name: gate-monasca-api-tempest-dsvm - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -39,7 +39,7 @@ - job: name: gate-monasca-api-java-tempest-dsvm - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -81,7 +81,7 @@ - job: name: gate-monasca-persister-tempest-dsvm - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -119,7 +119,7 @@ - job: name: gate-monasca-persister-java-tempest-dsvm - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/murano.yaml b/jenkins/jobs/murano.yaml index 43ec46e2bc..3355123850 100644 --- a/jenkins/jobs/murano.yaml +++ b/jenkins/jobs/murano.yaml @@ -1,6 +1,6 @@ - job: name: gate-murano-devstack-dsvm - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -55,7 +55,7 @@ # Murano and Congress integration functional tests - job: name: gate-murano-congress-devstack-dsvm - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/neutron-lbaas.yaml b/jenkins/jobs/neutron-lbaas.yaml index b9750f958e..350d3a86e5 100644 --- a/jenkins/jobs/neutron-lbaas.yaml +++ b/jenkins/jobs/neutron-lbaas.yaml @@ -47,7 +47,7 @@ - job: name: gate-neutron-lbaas-dashboard-dsvm-integration - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/nova-docker.yaml b/jenkins/jobs/nova-docker.yaml index 23ec428115..eed21fcf7b 100644 --- a/jenkins/jobs/nova-docker.yaml +++ b/jenkins/jobs/nova-docker.yaml @@ -1,6 +1,6 @@ - job: name: gate-tempest-dsvm-docker - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/oslo.yaml b/jenkins/jobs/oslo.yaml index 727b8fd72b..74ad8789d7 100644 --- a/jenkins/jobs/oslo.yaml +++ b/jenkins/jobs/oslo.yaml @@ -90,11 +90,11 @@ # jobs: # - '{pipeline}-{injectedlib}-dsvm-{name}{job-suffix}': # pipeline: check -# node: devstack-trusty +# node: ubuntu-trusty # job-suffix: '' # branch-override: default # - '{pipeline}-{injectedlib}-dsvm-{name}{job-suffix}': # pipeline: gate -# node: devstack-trusty +# node: ubuntu-trusty # job-suffix: '' # branch-override: default diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index b470f26231..e950b1f8d7 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -127,19 +127,19 @@ - translation-jobs - openstack-releasenotes-jobs - '{pipeline}-aodh-dsvm-functional-{backend}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate backend: hbase - '{pipeline}-aodh-dsvm-functional-{backend}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate backend: mysql - '{pipeline}-aodh-dsvm-functional-{backend}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate backend: postgresql - '{pipeline}-aodh-dsvm-functional-{backend}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate backend: mongodb - 'gate-telemetry-dsvm-integration-{name}' @@ -182,12 +182,12 @@ - hook-{name}-rtfd - '{pipeline}-functional-dsvm-astara{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-functional-dsvm-astara-appliance-src{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -411,48 +411,48 @@ - openstack-releasenotes-jobs - 'gate-tempest-dsvm-ceilometer-{backend}-full{job-suffix}': backend: 'mongodb' - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - 'gate-tempest-dsvm-ceilometer-{backend}-full{job-suffix}': backend: 'mysql' - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - 'gate-tempest-dsvm-ceilometer-{backend}-full{job-suffix}': backend: 'postgresql' - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - 'gate-tempest-dsvm-ceilometer-{backend}{job-suffix}': backend: 'es' - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - 'gate-tempest-dsvm-ceilometer-{backend}-full{job-suffix}': backend: 'es' - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - 'gate-tempest-dsvm-ceilometer-{backend}-neutron-full{job-suffix}': backend: 'mysql' - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-ceilometer-dsvm-functional-{backend}{job-suffix}': pipeline: 'gate' backend: 'mongodb' - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-ceilometer-dsvm-functional-{backend}{job-suffix}': pipeline: 'gate' backend: 'mysql' - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-ceilometer-dsvm-functional-{backend}{job-suffix}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate backend: postgresql job-suffix: '' @@ -488,7 +488,7 @@ - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}-plugin': project-repo: ceilometer pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -704,7 +704,7 @@ - openstack-releasenotes-jobs - '{pipeline}-cinder-dsvm-apache{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - 'gate-{name}-tox-db-{envlist}': @@ -852,12 +852,12 @@ - openstack-publish-jobs - '{pipeline}-congress-dsvm-api{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-congress-new-arch-devstack{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - 'gate-{name}-tox-db-{envlist}': @@ -1025,12 +1025,12 @@ - translation-jobs - gate-rally-dsvm-designate-{name} - 'gate-designate-dsvm-{designate-driver}': - node: devstack-trusty + node: ubuntu-trusty designate-driver: - powerdns - bind9 - 'gate-designate-dsvm-{designate-driver}-postgres': - node: devstack-trusty + node: ubuntu-trusty designate-driver: - powerdns - 'gate-{name}-tox-{envlist}': @@ -1073,7 +1073,7 @@ # Normal gate and check jobs - devstack-jobs: pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default # Stable gate jobs for branchless tempest @@ -1120,22 +1120,22 @@ node: ubuntu-trusty - '{pipeline}-grenade-dsvm-multinode{job-suffix}': pipeline: gate - node: devstack-trusty-2-node + node: ubuntu-trusty-2-node job-suffix: '' branch-override: default - '{pipeline}-grenade-dsvm-multinode{job-suffix}': pipeline: gate - node: devstack-trusty-2-node + node: ubuntu-trusty-2-node job-suffix: '-nv' branch-override: default - '{pipeline}-{name}-src-grenade-dsvm-multinode{job-suffix}': pipeline: gate - node: devstack-trusty-2-node + node: ubuntbu-trusty-2-node job-suffix: '' branch-override: default - '{pipeline}-{name}-src-grenade-dsvm-multinode{job-suffix}': pipeline: gate - node: devstack-trusty-2-node + node: ubuntu-trusty-2-node job-suffix: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-multinode-full{job-suffix}': @@ -1219,11 +1219,11 @@ jobs: - gate-{name}-bashate - '{pipeline}-tempest-dsvm-full-bdd{job-suffix}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate job-suffix: '-nv' - '{pipeline}-tempest-dsvm-full-bdd{job-suffix}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate job-suffix: '' @@ -1233,14 +1233,14 @@ jobs: - gate-{name}-bashate - '{pipeline}-tempest-dsvm-full-devstack-plugin-ceph{job-suffix}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate plugin: ceph plugin-repo: openstack/devstack-plugin-ceph job-suffix: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-full-devstack-plugin-ceph{job-suffix}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate plugin: ceph plugin-repo: openstack/devstack-plugin-ceph @@ -1253,11 +1253,11 @@ jobs: - gate-{name}-bashate - '{pipeline}-cinder-tempest-dsvm-glusterfs{job-suffix}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate job-suffix: '-nv' - '{pipeline}-cinder-tempest-dsvm-glusterfs{job-suffix}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate job-suffix: '' @@ -1267,7 +1267,7 @@ jobs: - gate-{name}-bashate - '{pipeline}-tempest-dsvm-full-{plugin}{job-suffix}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate plugin: hdfs plugin-repo: openstack/devstack-plugin-hdfs @@ -1340,16 +1340,16 @@ - openstack-publish-jobs - pypi-jobs - gate-dib-dsvm-functests-{node}: - node: devstack-trusty + node: ubuntu-trusty - gate-dib-dsvm-functests-{node}: node: devstack-centos7 - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-dib' branch-override: default - gate-dib-dsvm-functests-{node}-pip: - node: devstack-trusty + node: ubuntu-trusty - gate-dib-dsvm-functests-{node}-pip: node: devstack-centos7 @@ -1419,17 +1419,17 @@ - openstack-publish-jobs - '{pipeline}-tempest-dsvm-dragonflow{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-dragonflow-dsvm-rally{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{pipeline}-dragonflow-dsvm-fullstack{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default @@ -1461,13 +1461,13 @@ - pypi-jobs - '{pipeline}-functional-{network}-dsvm-ec2api{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default network: 'neutron' - '{pipeline}-functional-{network}-dsvm-ec2api{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default network: 'nova-network' @@ -1743,12 +1743,12 @@ - pypi-jobs - '{pipeline}-functional-neutron-dsvm-gceapi{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-functional-nova-network-dsvm-gceapi{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -1899,11 +1899,11 @@ - '{pipeline}-glance_store-dsvm-functional-{driver}': driver: filesystem pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-tempest-dsvm-full-ceph-src-{name}{job-suffix}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate job-suffix: '' branch-override: default @@ -1935,22 +1935,22 @@ - pypi-jobs - gate-{name}-bashate - '{pipeline}-gnocchi-dsvm-functional-{storagedriver}-{sqldriver}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate storagedriver: file sqldriver: mysql - '{pipeline}-gnocchi-dsvm-functional-{storagedriver}-{sqldriver}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate storagedriver: swift sqldriver: postgresql - '{pipeline}-gnocchi-dsvm-functional-{storagedriver}-{sqldriver}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate storagedriver: ceph sqldriver: mysql - '{pipeline}-gnocchi-dsvm-functional-{storagedriver}-{sqldriver}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate storagedriver: influxdb sqldriver: mysql @@ -1986,12 +1986,12 @@ - pypi-jobs - '{pipeline}-group-based-policy-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-group-based-policy-dsvm-rally{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -2066,7 +2066,7 @@ - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}': datastore: mysql pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default engine: orig @@ -2074,7 +2074,7 @@ - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}': datastore: mysql pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-designator: '' branch-override: default @@ -2083,7 +2083,7 @@ - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}': datastore: postgres pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default engine: orig @@ -2091,7 +2091,7 @@ - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}': datastore: mysql pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default engine: convg @@ -2099,29 +2099,29 @@ - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}': datastore: mysql pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default engine: convg lbaasversion: lbaasv2 - '{pipeline}-tempest-dsvm-heat{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-tempest-dsvm-heat-apache{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-grenade-dsvm-heat{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-grenade-dsvm-heat{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - python-kilo-bitrot-jobs @@ -2281,68 +2281,68 @@ - openstack-releasenotes-jobs - '{pipeline}-ironic-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-ironic-pxe_ipa-tinyipa{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-ironic-pxe_ipa-full{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-ironic-pxe_ipa-postgres{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-ironic-agent_ssh{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-ironic-agent_ipmitool{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-ironic-pxe_ipmitool{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-ironic-pxe_ipa{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-ironic-pxe_ipa-src{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-ironic-parallel{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{pipeline}-ironic-inspector-dsvm-{ramdisk}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default ramdisk: ipa - '{pipeline}-tempest-dsvm-ironic-pxe_libvirt{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{trigger}-tripleo-ci-{jobname}': @@ -2410,25 +2410,25 @@ envlist: func - '{pipeline}-ironic-inspector-dsvm-{ramdisk}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default ramdisk: 'dib' - '{pipeline}-ironic-inspector-dsvm-{ramdisk}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default ramdisk: 'ipa' - '{pipeline}-ironic-inspector-dsvm-{ramdisk}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default ramdisk: 'ipa-ipxe' - '{pipeline}-ironic-inspector-dsvm-discovery{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default @@ -2448,7 +2448,7 @@ - pypi-jobs - '{pipeline}-tempest-dsvm-ironic-lib-src{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -2464,7 +2464,7 @@ - openstack-releasenotes-jobs - '{pipeline}-ironic-inspector-dsvm-{ramdisk}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default ramdisk: 'ipa-src' @@ -2549,12 +2549,12 @@ pipeline: gate job-suffix: '' branch-override: default - node: devstack-trusty + node: ubuntu-trusty - '{pipeline}-tempest-dsvm-keystone-uwsgi-full{job-suffix}': pipeline: gate job-suffix: '-nv' branch-override: default - node: devstack-trusty + node: ubuntu-trusty - periodic-python-jobs-with-oslo-master - project: @@ -2659,13 +2659,13 @@ - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}': action: build distro: ubuntu - node: devstack-trusty + node: ubuntu-trusty pipeline: gate type: source - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}': action: deploy distro: ubuntu - node: devstack-trusty + node: ubuntu-trusty pipeline: gate type: source - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}': @@ -2695,7 +2695,7 @@ - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}': action: deploy-multinode distro: ubuntu - node: 'devstack-trusty-2-node' + node: 'ubuntu-trusty-2-node' pipeline: gate type: source @@ -2709,7 +2709,7 @@ - openstack-publish-jobs - '{pipeline}-kolla-mesos-dsvm-{distro}-{type}': distro: ubuntu - node: devstack-trusty + node: ubuntu-trusty pipeline: gate type: source @@ -2737,17 +2737,17 @@ - pypi-jobs - '{pipeline}-install-dsvm-kuryr{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-kuryr-dsvm-fullstack{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{pipeline}-kuryr-dsvm-rally{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default @@ -2786,25 +2786,25 @@ - translation-jobs - '{pipeline}-functional-dsvm-magnum-{coe}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty coe: 'api' job-suffix: '' branch-override: default - '{pipeline}-functional-dsvm-magnum-{coe}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty coe: 'k8s' job-suffix: '' branch-override: default - '{pipeline}-functional-dsvm-magnum-{coe}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty coe: 'swarm' job-suffix: '' branch-override: default - '{pipeline}-functional-dsvm-magnum-{coe}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty coe: 'mesos' job-suffix: '' branch-override: default @@ -2930,7 +2930,7 @@ - openstack-publish-jobs - '{pipeline}-{component}-devstack-dsvm': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty component: mistral - gate-rally-dsvm-mistral-{name}: name: task @@ -3078,12 +3078,12 @@ name: task - 'gate-tempest-dsvm-murano-{mode}{job-suffix}': mode: 'cfapi' - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - 'gate-tempest-dsvm-murano-{mode}{job-suffix}': mode: 'api' - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - translation-jobs @@ -3188,12 +3188,12 @@ - pypi-jobs - '{pipeline}-install-dsvm-networking-bgpvpn{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-install-dsvm-networking-bgpvpn-bagpipe{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -3317,22 +3317,22 @@ - translation-jobs - '{pipeline}-tempest-dsvm-networking-midonet-v1{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-tempest-dsvm-networking-midonet-v2{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-tempest-dsvm-networking-midonet-ml2{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-networking-midonet-v2-rally-dsvm{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default @@ -3361,25 +3361,25 @@ - pypi-jobs - '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' odl-release-base: 'lithium-snapshot' branch-override: default - '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' odl-release-base: 'beryllium-snapshot' branch-override: default - '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' odl-release-base: 'boron-snapshot' branch-override: default - '{pipeline}-rally-dsvm-networking-odl-{odl-release-base}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' odl-release-base: 'beryllium-snapshot' branch-override: default @@ -3395,22 +3395,22 @@ - pypi-jobs - '{pipeline}-tempest-dsvm-networking-ofagent{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-tempest-dsvm-networking-ofagent{job-suffix}': pipeline: periodic - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-master' branch-override: master - '{pipeline}-tempest-dsvm-networking-ofagent{job-suffix}': pipeline: periodic - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-liberty' branch-override: stable/liberty - '{pipeline}-tempest-dsvm-networking-ofagent{job-suffix}': pipeline: periodic - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-kilo' branch-override: stable/kilo @@ -3425,7 +3425,7 @@ - pypi-jobs - '{pipeline}-tempest-dsvm-networking-onos{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -3441,17 +3441,17 @@ - openstack-publish-jobs - '{pipeline}-tempest-dsvm-networking-ovn{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-rally-dsvm-networking-ovn{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{pipeline}-install-dsvm-networking-ovn-kuryr{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default @@ -3524,72 +3524,72 @@ - openstack-releasenotes-jobs - '{pipeline}-grenade-dsvm-neutron-multinode{job-suffix}': pipeline: gate - node: devstack-trusty-2-node + node: ubuntu-trusty-2-node job-suffix: '' branch-override: default - '{pipeline}-grenade-dsvm-neutron-dvr-multinode{job-suffix}': pipeline: gate - node: devstack-trusty-2-node + node: ubuntu-trusty-2-node job-suffix: '' branch-override: default - '{pipeline}-neutron-dsvm-functional{python}{job-suffix}': pipeline: gate python: '' - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-neutron-dsvm-functional{python}{job-suffix}': pipeline: gate python: '-py34' - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-neutron-dsvm-functional{python}{job-suffix}': pipeline: gate python: '' - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{pipeline}-neutron-dsvm-fullstack{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-neutron-dsvm-api{which}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default which: '' - '{pipeline}-neutron-dsvm-api{which}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default which: '-pecan' - '{pipeline}-tempest-dsvm-neutron-linuxbridge{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-tempest-dsvm-neutron{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-neutron-ipv6only{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-tempest-dsvm-neutron-serviceipv6{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-tempest-dsvm-neutron-{which}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default which: pecan @@ -3618,12 +3618,12 @@ - openstack-releasenotes-jobs - '{pipeline}-neutron-fwaas-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-neutron-fwaas-dsvm-tempest{branch-designator}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty branch-designator: '' branch-override: default @@ -3641,63 +3641,63 @@ - openstack-releasenotes-jobs - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default lbaasversion: lbaasv2 lbaastest: scenario - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default lbaasversion: lbaasv2 lbaastest: minimal - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default lbaasversion: lbaasv1 lbaastest: api - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default lbaasversion: lbaasv2 lbaastest: healthmonitor - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default lbaasversion: lbaasv2 lbaastest: listener - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default lbaasversion: lbaasv2 lbaastest: loadbalancer - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default lbaasversion: lbaasv2 lbaastest: member - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default lbaasversion: lbaasv2 lbaastest: pool - '{pipeline}-neutron-{lbaasversion}-dsvm-{lbaastest}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default lbaasversion: lbaasv2 @@ -3727,7 +3727,7 @@ - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}': name: neutron-lib pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -3751,24 +3751,24 @@ - openstack-releasenotes-jobs - '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty vpnaastest: functional job-suffix: '' branch-override: default - '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty vpnaastest: functional-sswan job-suffix: '' branch-override: default - '{pipeline}-neutron-vpnaas-dsvm-rally{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-neutron-dsvm-tempest-vpnaas{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -3784,12 +3784,12 @@ - infra-publish-jobs - '{pipeline}-dsvm-nodepool{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: 'default' - '{pipeline}-dsvm-nodepool-src-shade{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: 'default' @@ -3901,7 +3901,7 @@ - 'gate-{name}-docs' - 'gate-{name}-linters' - 'gate-{name}-dsvm-commit': - node: devstack-trusty + node: ubuntu-trusty - project: name: openstack-ansible-apt_package_pinning @@ -4279,17 +4279,17 @@ - openstack-releasenotes-jobs - 'lib-forward-testing-{name}' - '{pipeline}-tempest-dsvm-full-ceph-src-{name}{job-suffix}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate job-suffix: '' branch-override: default - '{pipeline}-tempest-dsvm-full-lio-src-{name}{job-suffix}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate job-suffix: '' branch-override: default - '{pipeline}-tempest-dsvm-full-head-{name}{job-suffix}': - node: devstack-trusty + node: ubuntu-trusty pipeline: gate job-suffix: '' branch-override: default @@ -4499,7 +4499,7 @@ - 'stable-compat-jobs-{name}' - '{pipeline}-{name}-src-grenade-dsvm{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -4517,44 +4517,44 @@ - 'stable-compat-jobs-{name}' - '{pipeline}-{name}-src-grenade-dsvm{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-{name}-src-grenade-dsvm-multinode{job-suffix}': pipeline: gate - node: devstack-trusty-2-node + node: ubuntu-trusty-2-node job-suffix: '' branch-override: default - '{pipeline}-{name}-src-grenade-dsvm-multinode{job-suffix}': pipeline: gate - node: devstack-trusty-2-node + node: ubuntu-trusty-2-node job-suffix: '-nv' branch-override: default - '{pipeline}-oslo.messaging-dsvm-functional-{driver}{ostype}': driver: rabbit pipeline: gate - node: devstack-trusty + node: ubuntu-trusty ostype: '' job-suffix: '' branch-override: default - '{pipeline}-oslo.messaging-dsvm-functional-{driver}{ostype}': driver: qpid pipeline: gate - node: devstack-trusty + node: ubuntu-trusty ostype: '' job-suffix: '' branch-override: default - '{pipeline}-oslo.messaging-dsvm-functional-{driver}{ostype}': driver: zeromq pipeline: gate - node: devstack-trusty + node: ubuntu-trusty ostype: '' job-suffix: '' branch-override: default - '{pipeline}-oslo.messaging-dsvm-functional-{driver}{ostype}': driver: pika pipeline: gate - node: devstack-trusty + node: ubuntu-trusty ostype: '' job-suffix: '' branch-override: default @@ -4568,7 +4568,7 @@ - '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{job-suffix}': pipeline: gate plugin: zmq - node: devstack-trusty + node: ubuntu-trusty ostype: '' plugin-repo: openstack/devstack-plugin-zmq job-suffix: '' @@ -4582,22 +4582,22 @@ - '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{job-suffix}': pipeline: gate plugin: pika - node: devstack-trusty + node: ubuntu-trusty ostype: '' plugin-repo: openstack/devstack-plugin-pika job-suffix: '' - 'gate-telemetry-dsvm-integration-{name}' - 'gate-oslo.messaging-telemetry-dsvm-integration-{plugin}': - node: devstack-trusty + node: ubuntu-trusty plugin: pika - 'gate-oslo.messaging-telemetry-dsvm-integration-{plugin}': - node: devstack-trusty + node: ubuntu-trusty plugin: zmq - 'gate-tempest-neutron-dsvm-src-oslo.messaging-{plugin}': - node: devstack-trusty + node: ubuntu-trusty plugin: pika - 'gate-tempest-neutron-dsvm-src-oslo.messaging-{plugin}': - node: devstack-trusty + node: ubuntu-trusty plugin: zmq - project: @@ -4712,7 +4712,7 @@ - 'stable-compat-jobs-{name}' - '{pipeline}-{name}-src-grenade-dsvm-multinode{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -5629,7 +5629,7 @@ - puppet-check-jobs - puppet-openstack-integration-jobs - 'gate-puppet-openstack-integration-dsvm-multinode{job-suffix}': - node: devstack-trusty-2-node + node: ubuntu-trusty-2-node job-suffix: '-nv' - project: @@ -6240,12 +6240,12 @@ - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}-plugin': project-repo: ceilometer pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-ceilometerclient-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - 'gate-telemetry-dsvm-integration-{name}' @@ -6270,7 +6270,7 @@ - 'lib-forward-testing-{name}' - '{pipeline}-cinderclient-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -6359,7 +6359,7 @@ - 'lib-forward-testing-{name}' - '{pipeline}-glanceclient-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -6394,7 +6394,7 @@ - 'lib-forward-testing-{name}' - '{pipeline}-heatclient-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -6411,7 +6411,7 @@ envlist: func - '{pipeline}-python-ironic-inspector-client-dsvm{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -6428,12 +6428,12 @@ - 'lib-forward-testing-{name}' - '{pipeline}-ironicclient-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-tempest-dsvm-python-ironicclient-src{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -6460,7 +6460,7 @@ - 'lib-forward-testing-{name}' - '{pipeline}-keystoneclient-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - 'gate-{name}-tox-{envlist}': @@ -6514,7 +6514,7 @@ - pypi-jobs - '{pipeline}-{component}-devstack-dsvm': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty component: python-mistralclient - project: @@ -6535,7 +6535,7 @@ - pypi-jobs - '{pipeline}-muranoclient-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - openstack-releasenotes-jobs @@ -6563,13 +6563,13 @@ - 'lib-forward-testing-{name}' - '{pipeline}-neutronclient-test-dsvm-{which-test}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty which-test: functional job-suffix: '' branch-override: default - '{pipeline}-neutronclient-test-dsvm-{which-test}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty which-test: functional-adv-svcs job-suffix: '' branch-override: default @@ -6588,7 +6588,7 @@ - 'lib-forward-testing-{name}' - '{pipeline}-novaclient-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -6609,7 +6609,7 @@ - translation-jobs - '{pipeline}-osc-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - openstack-publish-jobs @@ -6625,7 +6625,7 @@ - python-jobs - '{pipeline}-sdk-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - pypi-jobs @@ -6656,12 +6656,12 @@ - openstack-releasenotes-jobs - '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-saharaclient-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -6742,7 +6742,7 @@ - pypi-jobs - '{pipeline}-swiftclient-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - 'lib-forward-testing-{name}' @@ -6774,7 +6774,7 @@ - pypi-jobs - '{pipeline}-tempest-dsvm-neutron-src-python-troveclient{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -6810,7 +6810,7 @@ - pypi-jobs - '{pipeline}-zaqarclient-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - 'lib-forward-testing-{name}' @@ -7013,19 +7013,19 @@ jobs: - '{pipeline}-requirements-integration-dsvm{variant}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty variant: '' - '{pipeline}-requirements-integration-dsvm{variant}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty variant: '-resolver' - '{pipeline}-pbr-installation-dsvm{variant}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty variant: '' - '{pipeline}-pbr-installation-dsvm{variant}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty variant: '-upstream' - project: @@ -7070,47 +7070,47 @@ envlist: bandit - '{pipeline}-tempest-dsvm-sahara{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default network: neutron engine: heat - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default network: nova engine: heat - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default network: neutron engine: heat - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default network: nova engine: heat - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default network: neutron engine: direct - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default network: nova @@ -7179,14 +7179,14 @@ - gate-{name}-pylint - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default network: neutron engine: heat - '{pipeline}-{name}-dsvm-scenario-{network}-{engine}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default network: nova @@ -7254,7 +7254,7 @@ - python-jobs - pypi-jobs - '{pipeline}-scalpels-dsvm-neutron{job-suffix}-{ostype}': - ostype: 'devstack-trusty' + ostype: 'ubuntu-trusty' pipeline: gate job-suffix: '' branch-override: default @@ -7303,7 +7303,7 @@ - python-jobs - '{pipeline}-senlin-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - translation-jobs @@ -7332,27 +7332,27 @@ - infra-publish-jobs - '{pipeline}-shade-dsvm-functional-keystone2{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: stable/liberty - '{pipeline}-shade-dsvm-functional-neutron{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-shade-dsvm-functional-nova{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-shade-dsvm-ansible{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-shade-dsvm-ansible-dev{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default @@ -7459,7 +7459,7 @@ envlist: py27sa07 - '{pipeline}-sqlalchemy-migrate-devstack-dsvm{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - hook-{name}-rtfd @@ -7679,12 +7679,12 @@ envlist: func-in-process-fast-post - '{pipeline}-swift-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default - '{pipeline}-swift-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-nv' branch-override: default # No one is interested in stable/ branches on swift, so don't run bitrot jobs @@ -7771,7 +7771,7 @@ - hook-{name}-rtfd - '{pipeline}-tacker-dsvm-functional{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -7799,7 +7799,7 @@ - python-jobs - '{pipeline}-tempest-dsvm-tap-as-a-service{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -8114,7 +8114,7 @@ - pypi-jobs - '{pipeline}-watcher-dsvm-multinode{job-suffix}': pipeline: gate - node: devstack-trusty-2-node + node: ubuntu-trusty-2-node job-suffix: '-nv' branch-override: default @@ -8394,13 +8394,13 @@ - gate-rally-dsvm-zaqar-{name} - '{pipeline}-dsvm-{backend}-zaqar{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default backend: mongodb - '{pipeline}-dsvm-{backend}-zaqar{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default backend: redis diff --git a/jenkins/jobs/python-barbicanclient.yaml b/jenkins/jobs/python-barbicanclient.yaml index 2d0391291c..c096f9ba87 100644 --- a/jenkins/jobs/python-barbicanclient.yaml +++ b/jenkins/jobs/python-barbicanclient.yaml @@ -1,6 +1,6 @@ - job: name: gate-python-barbicanclient-devstack-dsvm-oldstable - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -39,7 +39,7 @@ - job: name: gate-python-barbicanclient-devstack-dsvm - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/rally.yaml b/jenkins/jobs/rally.yaml index 99cacf9882..4382ef0d9e 100644 --- a/jenkins/jobs/rally.yaml +++ b/jenkins/jobs/rally.yaml @@ -221,7 +221,7 @@ - job: name: 'gate-rally-dsvm-manila-multibackend' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -241,7 +241,7 @@ - job: name: 'gate-rally-dsvm-manila-multibackend-no-ss' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -345,7 +345,7 @@ - job-template: name: 'gate-rally-dsvm-ironic-{name}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -407,7 +407,7 @@ - job-template: name: 'gate-rally-dsvm-murano-{name}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -428,7 +428,7 @@ - job-template: name: 'gate-rally-dsvm-mistral-{name}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -449,7 +449,7 @@ - job-template: name: 'gate-rally-dsvm-cue-{broker}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -469,7 +469,7 @@ - job-template: name: 'gate-rally-dsvm-designate-{name}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -490,7 +490,7 @@ - job-template: name: 'gate-rally-dsvm-{name}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -514,7 +514,7 @@ - job-template: name: 'gate-rally-dsvm-neutron-{name}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -538,7 +538,7 @@ - job-template: name: 'gate-rally-dsvm-fakevirt-{name}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -562,7 +562,7 @@ - job-template: name: 'gate-rally-dsvm-zaqar-{name}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -585,7 +585,7 @@ - job-template: name: 'gate-rally-dsvm-rally-{service}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -608,7 +608,7 @@ - job-template: name: 'gate-{name}-integrate-dsvm-rally' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -626,7 +626,7 @@ - job: name: 'gate-rally-dsvm-cli' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -672,7 +672,7 @@ - job-template: name: 'gate-rally-dsvm-verify-{mode}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -811,7 +811,7 @@ - job-template: name: 'gate-rally-dsvm-monasca-{name}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -829,7 +829,7 @@ - job: name: 'gate-rally-dsvm-keystone-v2api-rally' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml index 60a16a673f..c4fc07a659 100644 --- a/jenkins/jobs/sahara.yaml +++ b/jenkins/jobs/sahara.yaml @@ -1,6 +1,6 @@ - job: name: gate-sahara-dashboard-dsvm-integration - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/solum.yaml b/jenkins/jobs/solum.yaml index dacceeb9e5..39cbece54f 100644 --- a/jenkins/jobs/solum.yaml +++ b/jenkins/jobs/solum.yaml @@ -1,6 +1,6 @@ - job: name: 'gate-solum-devstack-dsvm' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/jenkins/jobs/tempest-jobs.yaml b/jenkins/jobs/tempest-jobs.yaml index 108e93f490..6a8eb0f2e8 100644 --- a/jenkins/jobs/tempest-jobs.yaml +++ b/jenkins/jobs/tempest-jobs.yaml @@ -3,7 +3,7 @@ jobs: - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '' branch-override: default @@ -12,6 +12,6 @@ jobs: - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}': pipeline: gate - node: devstack-trusty + node: ubuntu-trusty job-suffix: '-liberty' branch-override: stable/liberty diff --git a/jenkins/jobs/trove.yaml b/jenkins/jobs/trove.yaml index 573f01c119..c63062ef22 100644 --- a/jenkins/jobs/trove.yaml +++ b/jenkins/jobs/trove.yaml @@ -30,7 +30,7 @@ - job-template: name: 'gate-trove-functional-dsvm-{datastore}{job-suffix}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: @@ -82,7 +82,7 @@ - job-template: name: 'gate-trove-scenario-functional-dsvm-{datastore}{job-suffix}' - node: devstack-trusty + node: ubuntu-trusty wrappers: - build-timeout: diff --git a/zuul/layout.yaml b/zuul/layout.yaml index df22a3bddc..e1e4e4291a 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2326,7 +2326,7 @@ jobs: - name: gate-senlin-dsvm-functional voting: false - - name: gate-scalpels-dsvm-neutron-devstack-trusty + - name: gate-scalpels-dsvm-neutron-ubuntu-trusty voting: false - name: gate-scalpels-dsvm-neutron-fedora-23 @@ -4994,20 +4994,20 @@ projects: - name: check-requirements - name: publish-to-pypi check: - - gate-dib-dsvm-functests-devstack-trusty + - gate-dib-dsvm-functests-ubuntu-trusty - gate-dib-dsvm-functests-devstack-centos7 - gate-tempest-dsvm-ironic-pxe_ssh-dib check-tripleo: - gate-tripleo-ci-f22-nonha gate: - - gate-dib-dsvm-functests-devstack-trusty + - gate-dib-dsvm-functests-ubuntu-trusty - gate-dib-dsvm-functests-devstack-centos7 - gate-tempest-dsvm-ironic-pxe_ssh-dib post: - dib-utils-branch-tarball - dib-buildimage-debian-ironic experimental: - - gate-dib-dsvm-functests-devstack-trusty-pip + - gate-dib-dsvm-functests-ubuntu-trusty-pip - gate-dib-dsvm-functests-devstack-centos7-pip - name: openstack/diskimage-builder @@ -5019,13 +5019,13 @@ projects: - name: python-jobs - name: python3-jobs check: - - gate-dib-dsvm-functests-devstack-trusty + - gate-dib-dsvm-functests-ubuntu-trusty - gate-dib-dsvm-functests-devstack-centos7 - gate-tempest-dsvm-ironic-pxe_ssh-dib check-tripleo: - gate-tripleo-ci-f22-nonha gate: - - gate-dib-dsvm-functests-devstack-trusty + - gate-dib-dsvm-functests-ubuntu-trusty - gate-dib-dsvm-functests-devstack-centos7 - gate-tempest-dsvm-ironic-pxe_ssh-dib post: @@ -10056,7 +10056,7 @@ projects: - name: check-requirements - name: publish-to-pypi experimental: - - gate-scalpels-dsvm-neutron-devstack-trusty + - gate-scalpels-dsvm-neutron-ubuntu-trusty - gate-scalpels-dsvm-neutron-fedora-23 - name: openstack/searchlight