Delete static wheel-mirror slaves
And with that, we can delete 3 nodes from our control plane. We've successfully moved these nodes into zuulv3 jobs! Change-Id: Ibd9c8440050fb908d0f87595d7116fec587c9e7d Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger
parent
8a6cf7c1bd
commit
f7a06c8272
@ -39,18 +39,6 @@ zuul_nodes:
|
||||
host: 'signing01.ci.openstack.org'
|
||||
labels: 'signing'
|
||||
|
||||
- name: 'wheel-mirror-centos-7-amd64.slave.openstack.org'
|
||||
host: 'wheel-mirror-centos-7-amd64.slave.openstack.org'
|
||||
labels: 'wheel-mirror-centos-7-amd64'
|
||||
|
||||
- name: 'wheel-mirror-ubuntu-trusty-amd64.slave.openstack.org'
|
||||
host: 'wheel-mirror-ubuntu-trusty-amd64.slave.openstack.org'
|
||||
labels: 'wheel-mirror-ubuntu-trusty-amd64'
|
||||
|
||||
- name: 'wheel-mirror-ubuntu-xenial-amd64.slave.openstack.org'
|
||||
host: 'wheel-mirror-ubuntu-xenial-amd64.slave.openstack.org'
|
||||
labels: 'wheel-mirror-ubuntu-xenial-amd64'
|
||||
|
||||
# NOTE(pabelanger): zuulv3 settings
|
||||
zuul_connections:
|
||||
- name: 'gerrit'
|
||||
|
||||
@ -1924,20 +1924,6 @@ node 'codesearch.openstack.org' {
|
||||
}
|
||||
}
|
||||
|
||||
# Node-OS: trusty
|
||||
# Node-OS: centos7
|
||||
# Node-OS: xenial
|
||||
node /.*wheel-mirror-.*\.openstack\.org/ {
|
||||
$group = 'wheel-mirror'
|
||||
include openstack_project
|
||||
|
||||
class { 'openstack_project::wheel_mirror_slave':
|
||||
sysadmins => hiera('sysadmins', []),
|
||||
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
|
||||
wheel_keytab => hiera("wheel_keytab"),
|
||||
}
|
||||
}
|
||||
|
||||
# Node-OS: trusty
|
||||
node 'controller00.vanilla.ic.openstack.org' {
|
||||
$group = 'infracloud'
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# This script generates an index file for every directory in the wheel mirror
|
||||
# hierarchy.
|
||||
|
||||
DATA_DIRECTORY=$1
|
||||
|
||||
function build_index {
|
||||
index="<!DOCTYPE html>"
|
||||
index="$index<html><body><ul>"
|
||||
|
||||
# Match all strings that are /A/A(B/AB[C..])?$
|
||||
regex="\/([^/])\/\1(([^/])\/\1\3[^/]+)?$"
|
||||
for f in $(find $1 -type d -mindepth 2 -maxdepth 3); do
|
||||
# Pull only the AFS-Matching directories
|
||||
if [[ $f =~ $regex ]]; then
|
||||
# Get the last name in the folder path, the package name.
|
||||
dir=$(basename $BASH_REMATCH)
|
||||
# Echo it out.
|
||||
index="$index<li><a href=\"$dir/\">$dir</a></li>"
|
||||
fi
|
||||
done
|
||||
|
||||
index="$index</ul></body></html>"
|
||||
echo $index > $2
|
||||
}
|
||||
|
||||
for dir in $DATA_DIRECTORY/*; do
|
||||
build_index $dir "$dir/index.html"
|
||||
done
|
||||
@ -1,43 +0,0 @@
|
||||
# == Class: openstack_project::wheel_mirror
|
||||
#
|
||||
class openstack_project::wheel_mirror (
|
||||
$data_directory = '/srv/static/wheel',
|
||||
$config_directory = '/etc/wheel_mirror'
|
||||
) {
|
||||
|
||||
# The wheel mirror is a directory of python wheels, which have been rsynced'
|
||||
# from the wheel build slaves.
|
||||
file { "${data_directory}":
|
||||
ensure => directory,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
}
|
||||
|
||||
file { "${config_directory}":
|
||||
ensure => directory,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
}
|
||||
|
||||
file { "${config_directory}/rebuild_wheel_afs_index.sh":
|
||||
ensure => present,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0755',
|
||||
source => "puppet:///modules/openstack_project/mirror/rebuild_wheel_afs_index.sh",
|
||||
require => [
|
||||
File["${config_directory}"],
|
||||
]
|
||||
}
|
||||
|
||||
# */15 * * * *
|
||||
cron { 'rebuild wheel afs index':
|
||||
name => 'rebuild-wheel-afs-index.cron',
|
||||
command => "/bin/bash ${config_directory}/rebuild_wheel_afs_index.sh ${data_directory}",
|
||||
user => root,
|
||||
minute => '*/15',
|
||||
require => [
|
||||
File["${config_directory}/rebuild_wheel_afs_index.sh"],
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -1,89 +0,0 @@
|
||||
# Copyright 2015 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.
|
||||
#
|
||||
# Class to install dependencies for uploading python packages to pypi and
|
||||
# maven repositories
|
||||
#
|
||||
class openstack_project::wheel_mirror_slave (
|
||||
$jenkins_ssh_public_key,
|
||||
$project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
|
||||
$sysadmins = [],
|
||||
$jenkins_gitfullname = 'OpenStack Jenkins',
|
||||
$jenkins_gitemail = 'jenkins@openstack.org',
|
||||
$wheel_keytab = undef,
|
||||
) {
|
||||
|
||||
if( $wheel_keytab ) {
|
||||
file { "/etc/wheel.keytab":
|
||||
owner => 'jenkins',
|
||||
group => 'jenkins',
|
||||
mode => '0400',
|
||||
content => $wheel_keytab,
|
||||
}
|
||||
}
|
||||
|
||||
class { 'openstack_project::slave':
|
||||
sysadmins => $sysadmins,
|
||||
ssh_key => $jenkins_ssh_public_key,
|
||||
jenkins_gitfullname => $jenkins_gitfullname,
|
||||
jenkins_gitemail => $jenkins_gitemail,
|
||||
project_config_repo => $project_config_repo,
|
||||
afs => true,
|
||||
thin => true,
|
||||
}
|
||||
|
||||
# Create a working directory for the wheel slave, and give it to jenkins to
|
||||
# work with
|
||||
file { "/opt/wheel":
|
||||
ensure => 'directory',
|
||||
owner => 'jenkins',
|
||||
group => 'jenkins',
|
||||
mode => '0750',
|
||||
}
|
||||
|
||||
# below follows a rough list of things required to build binary
|
||||
# wheels.
|
||||
|
||||
# TODO: global-requirements keeps other-requirements that can be
|
||||
# parsed by bindep. We should have some sort of bindep provider
|
||||
# that can interact with that
|
||||
|
||||
case $::osfamily {
|
||||
'Debian': {
|
||||
ensure_packages(['build-essential',
|
||||
'python-all-dev', 'python3-all-dev',
|
||||
'libxml2-dev', 'libxslt-dev',
|
||||
'libffi-dev', 'libreadline-dev',
|
||||
'libssl-dev', 'libyaml-dev', 'zlib1g-dev',
|
||||
'libldap2-dev', 'libmysqlclient-dev',
|
||||
'libpq-dev', 'libsasl2-dev',
|
||||
'libsqlite3-dev', 'libvirt-dev', 'libzmq-dev',
|
||||
'parallel', 'pkg-config', 'swig', 'uuid-dev'])
|
||||
}
|
||||
'Redhat': {
|
||||
ensure_packages(['gcc', 'gcc-c++', 'make',
|
||||
'python-devel', 'python34-devel',
|
||||
'libxml2-devel', 'libxslt-devel',
|
||||
'libffi-devel', 'readline-devel',
|
||||
'openssl-devel', 'libyaml-devel', 'zlib-devel',
|
||||
'openldap-devel', 'mariadb-devel',
|
||||
'postgresql-devel', 'cyrus-sasl-devel',
|
||||
'sqlite-devel', 'libvirt-devel', 'zeromq-devel',
|
||||
'parallel', 'pkgconfig', 'swig', 'uuid-devel'])
|
||||
}
|
||||
default: {
|
||||
err "${::osfamily} not supported yet"
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user