Merge "Add a new node type for precise with saucy kernel"

modules/openstack_project/files/jenkins_job_builder/config/projects.yaml

@@ -1131,6 +1131,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

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 "$@"

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

modules/openstack_project/files/zuul/layout.yaml

@@ -792,6 +792,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:

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'