opendev/system-config
Code Issues Proposed changes

Remove devstack launch nodes and jobs

Browse Source 
Change-Id: Icc6ba916df45b2a763f85a73412f9c8e1df88701
This commit is contained in:
James E. Blair 2013-08-15 18:24:07 -07:00
parent d33f2b09e4
commit a38e256eb2
7 changed files with 4 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
manifests/site.pp
View File

@ -141,9 +141,7 @@ node 'graphite.openstack.org' {
graphite_admin_user => hiera('graphite_admin_user'),
graphite_admin_email => hiera('graphite_admin_email'),
graphite_admin_password => hiera('graphite_admin_password'),
statsd_hosts => ['devstack-launch.slave.openstack.org',
'devstack-launch01.slave.openstack.org',
'devstack-launch02.slave.openstack.org',
statsd_hosts => ['nodepool.openstack.org',
'zuul.openstack.org'],
}
}
@ -432,41 +430,6 @@ node 'mirror33.slave.openstack.org' {
}
}
node 'devstack-launch.slave.openstack.org' {
include openstack_project
class { 'openstack_project::devstack_launch_slave':
jenkins_api_user => hiera('jenkins_api_user'),
jenkins_api_key => hiera('jenkins_api_key'),
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
jenkins_server => 'jenkins.openstack.org',
}
}
node 'devstack-launch01.slave.openstack.org' {
include openstack_project
class { 'openstack_project::devstack_launch_slave':
jenkins_api_user => hiera('jenkins_api_user'),
jenkins_api_key => hiera('jenkins_api_key'),
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
jenkins_server => 'jenkins01.openstack.org',
jenkins_credentials_id => '8bcc2a78-0ce9-4383-aa14-039da7daf335',
}
}
node 'devstack-launch02.slave.openstack.org' {
include openstack_project
class { 'openstack_project::devstack_launch_slave':
jenkins_api_user => hiera('jenkins_api_user'),
jenkins_api_key => hiera('jenkins_api_key'),
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
jenkins_server => 'jenkins02.openstack.org',
jenkins_credentials_id => '8bcc2a78-0ce9-4383-aa14-039da7daf335',
}
}
node 'proposal.slave.openstack.org' {
include openstack_project
class { 'openstack_project::proposal_slave':

219
modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
View File

@ -9,7 +9,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -22,7 +21,6 @@
publishers:
- devstack-logs
- console-log
- devstack-complete
- job:
@ -36,7 +34,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -50,7 +47,7 @@
publishers:
- devstack-logs
- console-log
- devstack-complete
- job:
name: gate-tempest-devstack-vm-testr-full
@ -63,7 +60,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -77,7 +73,7 @@
publishers:
- devstack-logs
- console-log
- devstack-complete
- job:
name: gate-tempest-devstack-vm-cinder
@ -90,7 +86,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -104,7 +99,6 @@
publishers:
- devstack-logs
- console-log
- devstack-complete
- job:
@ -118,7 +112,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -132,7 +125,6 @@
publishers:
- devstack-logs
- console-log
- devstack-complete
- job:
@ -146,7 +138,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -161,7 +152,6 @@
publishers:
- devstack-logs
- console-log
- devstack-complete
- job:
@ -175,7 +165,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -189,7 +178,6 @@
publishers:
- devstack-logs
- console-log
- devstack-complete
- job:
@ -203,7 +191,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -218,7 +205,6 @@
publishers:
- devstack-logs
- console-log
- devstack-complete
- job:
@ -232,7 +218,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -247,7 +232,6 @@
publishers:
- devstack-logs-periodic
- console-log-periodic
- devstack-complete
- email:
recipients: openstack-stable-maint@lists.openstack.org
@ -263,7 +247,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -279,7 +262,6 @@
publishers:
- devstack-logs-periodic
- console-log-periodic
- devstack-complete
- email:
recipients: openstack-stable-maint@lists.openstack.org
@ -295,7 +277,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -311,7 +292,6 @@
publishers:
- devstack-logs-periodic
- console-log-periodic
- devstack-complete
- email:
recipients: openstack-stable-maint@lists.openstack.org
@ -327,7 +307,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -344,7 +323,6 @@
publishers:
- devstack-logs-periodic
- console-log-periodic
- devstack-complete
- email:
recipients: openstack-stable-maint@lists.openstack.org
@ -360,7 +338,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -376,7 +353,6 @@
publishers:
- devstack-logs-periodic
- console-log-periodic
- devstack-complete
- email:
recipients: openstack-stable-maint@lists.openstack.org
@ -392,7 +368,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -408,7 +383,6 @@
publishers:
- devstack-logs-periodic
- console-log-periodic
- devstack-complete
- email:
recipients: openstack-qa@lists.openstack.org
@ -424,7 +398,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -440,7 +413,6 @@
publishers:
- devstack-logs-periodic
- console-log-periodic
- devstack-complete
- email:
recipients: openstack-qa@lists.openstack.org
@ -456,7 +428,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -472,7 +443,6 @@
publishers:
- devstack-logs-periodic
- console-log-periodic
- devstack-complete
- email:
recipients: openstack-qa@lists.openstack.org
@ -488,7 +458,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -504,7 +473,6 @@
publishers:
- devstack-logs
- console-log
- devstack-complete
- job:
@ -518,7 +486,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -532,7 +499,6 @@
publishers:
- devstack-logs
- console-log
- devstack-complete
- job:
@ -546,7 +512,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -561,7 +526,6 @@
publishers:
- devstack-logs
- console-log
- devstack-complete
- job:
@ -575,7 +539,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -589,7 +552,7 @@
publishers:
- devstack-logs
- console-log
- devstack-complete
- job:
name: gate-grenade-devstack-vm-stable
@ -602,7 +565,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -616,178 +578,3 @@
publishers:
- devstack-logs
- console-log
- devstack-complete
# Called by devstack jobs to alert that they have started so that the
# jenkins slave they are running on can be disabled.
- job:
name: devstack-update-inprogress
node: devstack-launch
wrappers:
- timeout:
timeout: 10
fail: true
- timestamps
builders:
- devstack-checkout
- shell: |
#!/bin/bash -xe
export STATSD_HOST="graphite.openstack.org"
export STATSD_PORT=8125
export PYTHONUNBUFFERED=true
$WORKSPACE/devstack-gate/devstack-vm-inprogress.py $DEVSTACK_NODE_NAME
# Called by devstack jobs to alert that they have completed so that the
# jenkins slave may be deleted.
- job:
name: devstack-update-complete
node: devstack-launch
wrappers:
- timeout:
timeout: 10
fail: true
- timestamps
builders:
- devstack-checkout
- shell: |
#!/bin/bash -xe
export STATSD_HOST="graphite.openstack.org"
export STATSD_PORT=8125
export PYTHONUNBUFFERED=true
set +e
$WORKSPACE/devstack-gate/devstack-vm-inprogress.py $DEVSTACK_NODE_NAME
set -e
$WORKSPACE/devstack-gate/devstack-vm-delete.py $DEVSTACK_NODE_NAME
- job-template:
name: devstack-launch-vms-{provider}
concurrent: false
node: devstack-launch
wrappers:
- timeout:
timeout: 20
fail: true
- timestamps
triggers:
- timed: '*/10 * * * *'
builders:
- devstack-checkout
- shell: |
#!/bin/bash -xe
export STATSD_HOST="graphite.openstack.org"
export STATSD_PORT=8125
export PYTHONUNBUFFERED=true
$WORKSPACE/devstack-gate/devstack-vm-launch.py {provider}
- job-template:
name: devstack-reap-vms-{provider}
concurrent: false
node: devstack-launch
wrappers:
- timeout:
timeout: 10
fail: true
- timestamps
parameters:
- bool:
name: ALL_SERVERS
description: Delete all servers?
default: false
- bool:
name: ALL_IMAGES
description: Delete all images?
default: false
triggers:
- timed: '*/5 * * * *'
builders:
- devstack-checkout
- shell: |
#!/bin/bash -xe
if [ "$ALL_SERVERS" == 'true' ]; then
ALL_SERVERS="--all-servers"
else
ALL_SERVERS=""
fi
if [ "$ALL_IMAGES" == 'true' ]; then
ALL_IMAGES="--all-images"
else
ALL_IMAGES=""
fi
export STATSD_HOST="graphite.openstack.org"
export STATSD_PORT=8125
export PYTHONUNBUFFERED=true
$WORKSPACE/devstack-gate/devstack-vm-reap.py {provider} $ALL_SERVERS $ALL_IMAGES
- job-template:
name: devstack-check-vms-{provider}
concurrent: false
node: devstack-launch
wrappers:
- timeout:
timeout: 25
fail: true
- timestamps
triggers:
- timed: '*/30 * * * *'
builders:
- devstack-checkout
- shell: |
#!/bin/bash -xe
export STATSD_HOST="graphite.openstack.org"
export STATSD_PORT=8125
export PYTHONUNBUFFERED=true
$WORKSPACE/devstack-gate/devstack-vm-check.py {provider}
- job-template:
name: devstack-update-vm-image-{provider}
concurrent: false
node: devstack-launch
wrappers:
- timeout:
timeout: 360
fail: true
- timestamps
triggers:
- timed: '3 5 * * *'
builders:
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
$WORKSPACE/devstack-gate/devstack-vm-update-image.sh {provider}
- job-group:
name: devstack-node-provider-jobs
jobs:
- devstack-launch-vms-{provider}
- devstack-reap-vms-{provider}
- devstack-check-vms-{provider}
- devstack-update-vm-image-{provider}

21
modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
View File

@ -185,15 +185,6 @@
cd ..
fi
- builder:
name: devstack-inprogress
builders:
- trigger-builds:
- project: devstack-update-inprogress
block: true
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- builder:
name: link-logs
builders:
@ -297,18 +288,6 @@
keep-hierarchy: false
copy-after-failure: true
- publisher:
name: devstack-complete
publishers:
- trigger-parameterized-builds:
- project: devstack-update-complete
when: complete
predefined-parameters: |
DEVSTACK_NODE_NAME=${NODE_NAME}
UPSTREAM_BUILD_URL=${BUILD_URL}
UPSTREAM_JOB_NAME=${JOB_NAME}
UPSTREAM_BRANCH=${ZUUL_BRANCH}
- publisher:
name: coverage-log
publishers:

2
modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml
View File

@ -9,7 +9,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -34,4 +33,3 @@
keep-hierarchy: false
copy-after-failure: true
- console-log
- devstack-complete

40
modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
View File

@ -888,46 +888,6 @@
- pypi-jobs
- project:
name: devstack-node-provider-rackspace
provider: rackspace
jobs:
- devstack-node-provider-jobs
- project:
name: devstack-node-provider-rackspace-dfw
provider: rackspace-dfw
jobs:
- devstack-node-provider-jobs
- project:
name: devstack-node-provider-rackspace-ord
provider: rackspace-ord
jobs:
- devstack-node-provider-jobs
- project:
name: devstack-node-provider-hpcloud-az1
provider: hpcloud-az1
jobs:
- devstack-node-provider-jobs
- project:
name: devstack-node-provider-hpcloud-az2
provider: hpcloud-az2
jobs:
- devstack-node-provider-jobs
- project:
name: devstack-node-provider-hpcloud-az3
provider: hpcloud-az3
jobs:
- devstack-node-provider-jobs
- project:
name: pyghmi
github-org: stackforge

2
modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml
View File

@ -9,7 +9,6 @@
- timestamps
builders:
- devstack-inprogress
- devstack-checkout
- shell: |
#!/bin/bash -xe
@ -31,4 +30,3 @@
publishers:
- console-log
- devstack-complete

62
modules/openstack_project/manifests/devstack_launch_slave.pp
View File

@ -1,62 +0,0 @@
# Copyright 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.
#
# Install a host that manages the devstack node pool.
class openstack_project::devstack_launch_slave (
$jenkins_api_user,
$jenkins_api_key,
$jenkins_ssh_public_key,
$jenkins_ssh_private_key,
$jenkins_server,
$jenkins_credentials_id = '',
) {
class { 'openstack_project::slave':
bare => true,
ssh_key => $jenkins_ssh_public_key,
}
package { [ 'python-novaclient',
'python-jenkins',
'rackspace-auth-openstack',
'statsd',
'paramiko']:
ensure => latest,
provider => pip,
require => Class['pip'],
}
package { [ 'python-sqlalchemy',
'sqlite3']:
ensure => present,
}
file { '/home/jenkins/devstack-gate-secure.conf':
ensure => present,
owner => 'jenkins',
group => 'jenkins',
mode => '0600',
content => template('openstack_project/devstack-gate-secure.conf.erb'),
require => File['/home/jenkins'],
}
file { '/home/jenkins/.ssh/id_rsa':
owner => 'jenkins',
group => 'jenkins',
mode => '0400',
require => File['/home/jenkins/.ssh'],
content => $jenkins_ssh_private_key,
}
}