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 e6c0950557..f7999ee568 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -1125,6 +1125,11 @@ node: 'devstack-precise || devstack-precise-check' branch-designator: '' branch-override: default + - devstack-jobs: + pipeline: experimental + node: 'devstack-precise-saucy-kernel' + branch-designator: '' + branch-override: default # Stable check jobs for testing devstack gate - devstack-jobs: pipeline: check diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_devstack_new_kernel.sh b/modules/openstack_project/files/nodepool/scripts/prepare_devstack_new_kernel.sh new file mode 100644 index 0000000000..1dc1fec1e7 --- /dev/null +++ b/modules/openstack_project/files/nodepool/scripts/prepare_devstack_new_kernel.sh @@ -0,0 +1,27 @@ +#!/bin/bash -xe + +# Copyright (C) 2014 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# +# See the License for the specific language governing permissions and +# limitations under the License. + +if [ -f /usr/bin/apt-get ]; then + if [ "$(lsb_release -c -s)" = "precise" ]; then + sudo DEBIAN_FRONTEND=noninteractive apt-get \ + --option "Dpkg::Options::=--force-confold" \ + --assume-yes install linux-generic-lts-saucy + fi +fi + +/opt/nodepool-scripts/prepare_devstack.sh "$@" diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh new file mode 100644 index 0000000000..09a1b225a3 --- /dev/null +++ b/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_new_kernel.sh @@ -0,0 +1,22 @@ +#!/bin/bash -xe + +# Copyright (C) 2011-2013 OpenStack Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# +# See the License for the specific language governing permissions and +# limitations under the License. + +HOSTNAME=$1 + +./prepare_node.sh $HOSTNAME +sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack_new_kernel.sh $HOSTNAME diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index f247590612..6cce27be07 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -785,6 +785,10 @@ projects: - gate-grenade-dsvm-neutron-forward - neutron-upstream-translation-update - check-neutron-dsvm-functional + - experimental-tempest-dsvm-neutron + - experimental-tempest-dsvm-neutron-pg + - experimental-tempest-dsvm-neutron-isolated + - experimental-tempest-dsvm-neutron-pg-isolated pre-release: - neutron-tarball release: diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb index 815a6ab8ad..4326832c5c 100644 --- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb +++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb @@ -37,6 +37,13 @@ providers: setup: prepare_node_devstack.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-precise-saucy-kernel + base-image: 'Ubuntu 12.04 LTS (Precise Pangolin)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack_new_kernel.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa - name: rax-ord region-name: 'ORD' service-type: 'compute'