Merge "Add initial files for tripleo in the gate."
This commit is contained in:
commit
92fed68062
@ -383,6 +383,9 @@ node 'nodepool.openstack.org' {
|
|||||||
hpcloud_username => hiera('nodepool_hpcloud_username'),
|
hpcloud_username => hiera('nodepool_hpcloud_username'),
|
||||||
hpcloud_password => hiera('nodepool_hpcloud_password'),
|
hpcloud_password => hiera('nodepool_hpcloud_password'),
|
||||||
hpcloud_project => hiera('nodepool_hpcloud_project'),
|
hpcloud_project => hiera('nodepool_hpcloud_project'),
|
||||||
|
tripleo_username => hiera('nodepool_tripleo_username'),
|
||||||
|
tripleo_password => hiera('nodepool_tripleo_password'),
|
||||||
|
tripleo_project => hiera('nodepool_tripleo_project'),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -0,0 +1,34 @@
|
|||||||
|
- job:
|
||||||
|
name: 'gate-tripleo-deploy'
|
||||||
|
node: 'tripleo-precise'
|
||||||
|
|
||||||
|
wrappers:
|
||||||
|
- timeout:
|
||||||
|
timeout: 120
|
||||||
|
fail: true
|
||||||
|
- timestamps
|
||||||
|
|
||||||
|
builders:
|
||||||
|
- devstack-checkout
|
||||||
|
- shell: |
|
||||||
|
#!/bin/bash -xe
|
||||||
|
export PYTHONUNBUFFERED=true
|
||||||
|
export DEVSTACK_GATE_TEMPEST=0
|
||||||
|
export DEVSTACK_GATE_EXERCISES=0
|
||||||
|
function gate_hook {{
|
||||||
|
bash -xe $BASE/tripleo-incubator/toci_gate_test.sh
|
||||||
|
}}
|
||||||
|
export -f gate_hook
|
||||||
|
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||||
|
./safe-devstack-vm-gate-wrap.sh
|
||||||
|
- link-logs
|
||||||
|
|
||||||
|
publishers:
|
||||||
|
- scp:
|
||||||
|
site: 'static.openstack.org'
|
||||||
|
files:
|
||||||
|
- target: 'logs/$LOG_PATH'
|
||||||
|
source: '**/pip.log'
|
||||||
|
keep-hierarchy: false
|
||||||
|
copy-after-failure: true
|
||||||
|
- console-log
|
22
modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh
Executable file
22
modules/openstack_project/files/nodepool/scripts/prepare_node_tripleo.sh
Executable file
@ -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_tripleo.sh $HOSTNAME
|
47
modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh
Executable file
47
modules/openstack_project/files/nodepool/scripts/prepare_tripleo.sh
Executable file
@ -0,0 +1,47 @@
|
|||||||
|
#!/bin/bash -xe
|
||||||
|
|
||||||
|
# Copyright (C) 2011-2013 OpenStack Foundation
|
||||||
|
# Copyright (C) 2013 Hewlett-Packard Development Company, L.P.
|
||||||
|
#
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
mkdir -p ~/cache/files
|
||||||
|
mkdir -p ~/cache/pip
|
||||||
|
# Copied from devstack script, seems reasonable to keep and later
|
||||||
|
# build upon as needed
|
||||||
|
sudo DEBIAN_FRONTEND=noninteractive apt-get \
|
||||||
|
--option "Dpkg::Options::=--force-confold" \
|
||||||
|
--assume-yes install build-essential python-dev \
|
||||||
|
linux-headers-virtual linux-headers-`uname -r`
|
||||||
|
|
||||||
|
# Might use this later for other cache, keeping for consistancy
|
||||||
|
# rm -rf ~/workspace-cache
|
||||||
|
# mkdir -p ~/workspace-cache
|
||||||
|
|
||||||
|
rm -rf ~/tripleo
|
||||||
|
mkdir -p ~/tripleo
|
||||||
|
|
||||||
|
cd ~/tripleo
|
||||||
|
git clone https://review.openstack.org/p/openstack/tripleo-incubator
|
||||||
|
bash tripleo-incubator/scripts/pull-tools
|
||||||
|
|
||||||
|
# We'll want something like this for triplo when we do dependencies
|
||||||
|
#
|
||||||
|
#. /etc/lsb-release
|
||||||
|
#cd /opt/nodepool-scripts/
|
||||||
|
#python ./devstack-cache.py $DISTRIB_CODENAME
|
||||||
|
|
||||||
|
sync
|
||||||
|
sleep 5
|
@ -2314,6 +2314,8 @@ projects:
|
|||||||
- tripleo-incubator-docs
|
- tripleo-incubator-docs
|
||||||
release:
|
release:
|
||||||
- tripleo-incubator-docs
|
- tripleo-incubator-docs
|
||||||
|
experimental:
|
||||||
|
- gate-tripleo-deploy
|
||||||
|
|
||||||
- name: stackforge/climate
|
- name: stackforge/climate
|
||||||
check:
|
check:
|
||||||
|
@ -15,6 +15,9 @@ class openstack_project::nodepool(
|
|||||||
$hpcloud_username ='',
|
$hpcloud_username ='',
|
||||||
$hpcloud_password ='',
|
$hpcloud_password ='',
|
||||||
$hpcloud_project ='',
|
$hpcloud_project ='',
|
||||||
|
$tripleo_username ='',
|
||||||
|
$tripleo_password ='',
|
||||||
|
$tripleo_project ='',
|
||||||
) {
|
) {
|
||||||
class { 'openstack_project::server':
|
class { 'openstack_project::server':
|
||||||
sysadmins => $sysadmins,
|
sysadmins => $sysadmins,
|
||||||
|
@ -116,6 +116,23 @@ providers:
|
|||||||
setup: prepare_node_devstack.sh
|
setup: prepare_node_devstack.sh
|
||||||
username: jenkins
|
username: jenkins
|
||||||
private-key: /home/nodepool/.ssh/id_rsa
|
private-key: /home/nodepool/.ssh/id_rsa
|
||||||
|
- name: tripleo-test-cloud
|
||||||
|
region-name: ''
|
||||||
|
service-type: 'compute'
|
||||||
|
service-name: 'Compute'
|
||||||
|
username: '<%= tripleo_username %>'
|
||||||
|
password: '<%= tripleo_password %>'
|
||||||
|
project-id: '<%= tripleo_project %>'
|
||||||
|
auth-url: 'https://poc.tripleo.org:10000/v2.0'
|
||||||
|
boot-timeout: 120
|
||||||
|
max-servers: 2
|
||||||
|
images:
|
||||||
|
- name: tripleo-precise
|
||||||
|
base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit'
|
||||||
|
min-ram: 8192
|
||||||
|
setup: prepare_node_tripleo.sh
|
||||||
|
username: jenkins
|
||||||
|
private-key: /home/nodepool/.ssh/id_rsa
|
||||||
|
|
||||||
targets:
|
targets:
|
||||||
- name: jenkins01
|
- name: jenkins01
|
||||||
@ -137,6 +154,10 @@ targets:
|
|||||||
- name: rax-iad
|
- name: rax-iad
|
||||||
- name: rax-dfw
|
- name: rax-dfw
|
||||||
- name: rax-ord
|
- name: rax-ord
|
||||||
|
- name: tripleo-precise
|
||||||
|
min-ready: 1
|
||||||
|
providers:
|
||||||
|
- name: tripleo-test-cloud
|
||||||
- name: jenkins02
|
- name: jenkins02
|
||||||
jenkins:
|
jenkins:
|
||||||
url: 'https://jenkins02.openstack.org/'
|
url: 'https://jenkins02.openstack.org/'
|
||||||
@ -156,3 +177,7 @@ targets:
|
|||||||
- name: rax-iad
|
- name: rax-iad
|
||||||
- name: rax-dfw
|
- name: rax-dfw
|
||||||
- name: rax-ord
|
- name: rax-ord
|
||||||
|
- name: tripleo-precise
|
||||||
|
min-ready: 1
|
||||||
|
providers:
|
||||||
|
- name: tripleo-test-cloud
|
||||||
|
Loading…
Reference in New Issue
Block a user