From 1bedc4440408bb1942e81524417a3234a3fe4147 Mon Sep 17 00:00:00 2001
From: Ian Main <imain@redhat.com>
Date: Tue, 22 Jul 2014 17:31:46 -0400
Subject: [PATCH] Change nova docker tests to run in the main Ubuntu image.
We were having intermittent failures with the experimental fedora 20
image so we are going to switch to the more tested Ubuntu image.
Change-Id: I3261af31bb07f281ba5acfb083ff46bdaa043e6f
---
.../files/jenkins_job_builder/config/nova-docker.yaml | 4 ++--
modules/openstack_project/files/zuul/layout.yaml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/nova-docker.yaml b/modules/openstack_project/files/jenkins_job_builder/config/nova-docker.yaml
index 8765b5aee5..e98626062a 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/nova-docker.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/nova-docker.yaml
@@ -1,6 +1,6 @@
- job:
- name: 'check-nova-docker-dsvm-f20'
- node: 'devstack-f20'
+ name: 'check-nova-docker-dsvm'
+ node: 'devstack-precise || devstack-trusty'
wrappers:
- build-timeout:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index a842df7731..9964a06ae8 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -662,7 +662,7 @@ jobs:
voting: false
- name: gate-oslo-incubator-python33
branch: ^(?!stable/havana).*$
- - name: check-nova-docker-dsvm-f20
+ - name: check-nova-docker-dsvm
voting: false
- name: check-neutron-dsvm-functional
branch: ^(?!stable/havana).*$
@@ -1177,7 +1177,7 @@ projects:
- name: python-jobs
- name: check-requirements
check:
- - check-nova-docker-dsvm-f20
+ - check-nova-docker-dsvm
- name: openstack/pycadf
template: