Includes: Fixing jenkins sudoers from jeblair Removing tarmac depend from jeblair Remove wheel group from jeblair Change-Id: I86ec23f7aeafc31cc70b0f3a648739bb7316fc61changes/43/843/8
Monty Taylor
12 years ago
parent
37ffe84997
commit
b47dbcdef0
@ -1,6 +0,0 @@
|
||||
server {
|
||||
listen 80;
|
||||
server_name packages.openstack.org;
|
||||
root /srv/packages;
|
||||
autoindex on;
|
||||
}
|
||||
@ -1,45 +0,0 @@
|
||||
class apt_server {
|
||||
|
||||
package { "nginx": ensure => "latest" }
|
||||
|
||||
file { "/etc/nginx/sites-available/default":
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => 444,
|
||||
ensure => 'present',
|
||||
source => "puppet:///modules/apt_server/packages",
|
||||
replace => 'true',
|
||||
require => Package[nginx],
|
||||
}
|
||||
|
||||
file { "/etc/nginx/sites-enabled/default":
|
||||
ensure => link,
|
||||
target => "/etc/nginx/sites-available/default",
|
||||
require => Package[nginx],
|
||||
}
|
||||
|
||||
file { "/srv":
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => 555,
|
||||
ensure => directory,
|
||||
}
|
||||
|
||||
file {"/srv/packages":
|
||||
owner => 'jenkins',
|
||||
group => 'jenkins',
|
||||
mode => 755,
|
||||
ensure => directory,
|
||||
require => File["/srv"],
|
||||
}
|
||||
|
||||
service { 'nginx':
|
||||
name => 'nginx',
|
||||
ensure => running,
|
||||
enable => true,
|
||||
hasrestart => true,
|
||||
require => Package['nginx'],
|
||||
subscribe => File['/etc/nginx/sites-available/default'],
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
apt-get -y install --force-yes lsb-release
|
||||
release=`lsb_release --codename -s`
|
||||
|
||||
if test `lsb_release --id --short` = "Ubuntu"
|
||||
then
|
||||
|
||||
apt-get -y install --force-yes python-software-properties
|
||||
|
||||
cat > "/etc/apt/sources.list.d/extras.list" << EOF
|
||||
deb http://security.ubuntu.com/ubuntu $release-security main universe
|
||||
deb-src http://security.ubuntu.com/ubuntu $release-security main universe
|
||||
deb http://us.archive.ubuntu.com/ubuntu/ $release-updates main universe
|
||||
deb-src http://us.archive.ubuntu.com/ubuntu/ $release-updates main universe
|
||||
|
||||
deb http://packages.openstack.org/trunk $release main
|
||||
deb-src http://packages.openstack.org/trunk $release main
|
||||
EOF
|
||||
|
||||
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 32EE128C
|
||||
rm -rf /etc/apt/sources.list.d/nova-core*
|
||||
else
|
||||
# Have I mentioned our lack of debian is a bit assy? Let's hope Maverick
|
||||
# works for now
|
||||
cat > "/etc/apt/sources.list.d/extras.list" << EOF
|
||||
deb http://packages.openstack.org/trunk $release main
|
||||
deb-src http://packages.openstack.org/trunk $release main
|
||||
EOF
|
||||
rm -rf /etc/apt/sources.list.d/nova.list
|
||||
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 32EE128C
|
||||
fi
|
||||
|
||||
apt-get update
|
||||
@ -1,78 +0,0 @@
|
||||
define cowbuilder::cow($distro = ubuntu) {
|
||||
|
||||
$has_cow = "/usr/bin/test -d /var/cache/pbuilder/base-$name.cow"
|
||||
$has_cow_32 = "/usr/bin/test -d /var/cache/pbuilder/base-$name-i386.cow"
|
||||
case $bits {
|
||||
32: {
|
||||
$env = ["ARCH=i386", "DIST=$name","APTCACHEHARDLINK=no","HOME=/root"]
|
||||
}
|
||||
64: {
|
||||
$env = ["DIST=$name","APTCACHEHARDLINK=no","HOME=/root"]
|
||||
}
|
||||
}
|
||||
|
||||
case $distro {
|
||||
ubuntu: {
|
||||
exec { "Add base cow for $name":
|
||||
environment => ["DIST=$name","APTCACHEHARDLINK=no","HOME=/root"],
|
||||
command => "git-pbuilder create --distribution $name --components 'main universe' --hookdir /var/cache/pbuilder/hook.d/ --mirror='http://us.archive.ubuntu.com/ubuntu/'",
|
||||
path => "/usr/sbin:/usr/bin:/sbin:/bin",
|
||||
user => root,
|
||||
group => root,
|
||||
timeout => 0,
|
||||
logoutput => on_failure,
|
||||
unless => "$has_cow",
|
||||
}
|
||||
exec { "Add 32-bit base cow for $name":
|
||||
environment => ["ARCH=i386", "DIST=$name","APTCACHEHARDLINK=no","HOME=/root"],
|
||||
command => "linux32 git-pbuilder create --distribution $name --components 'main universe' --hookdir /var/cache/pbuilder/hook.d/ --mirror='http://us.archive.ubuntu.com/ubuntu/'",
|
||||
path => "/usr/sbin:/usr/bin:/sbin:/bin",
|
||||
user => root,
|
||||
group => root,
|
||||
timeout => 0,
|
||||
logoutput => on_failure,
|
||||
unless => "$has_cow_32",
|
||||
}
|
||||
}
|
||||
debian: {
|
||||
exec { "Add base cow for $name":
|
||||
environment => ["DIST=$name","APTCACHEHARDLINK=no","HOME=/root"],
|
||||
command => "git-pbuilder create --distribution $name --mirror ftp://ftp.us.debian.org/debian/ --debootstrapopts '--keyring=/usr/share/keyrings/debian-archive-keyring.gpg' --hookdir /var/cache/pbuilder/hook.d/",
|
||||
path => "/usr/sbin:/usr/bin:/sbin:/bin",
|
||||
user => root,
|
||||
group => root,
|
||||
timeout => 0,
|
||||
logoutput => on_failure,
|
||||
unless => "$has_cow",
|
||||
}
|
||||
exec { "Add 32-bit base cow for $name":
|
||||
environment => ["ARCH=i386", "DIST=$name","APTCACHEHARDLINK=no","HOME=/root"],
|
||||
command => "linux32 git-pbuilder create --distribution $name --mirror ftp://ftp.us.debian.org/debian/ --debootstrapopts '--keyring=/usr/share/keyrings/debian-archive-keyring.gpg' --hookdir /var/cache/pbuilder/hook.d/",
|
||||
path => "/usr/sbin:/usr/bin:/sbin:/bin",
|
||||
user => root,
|
||||
group => root,
|
||||
timeout => 0,
|
||||
logoutput => on_failure,
|
||||
unless => "$has_cow_32",
|
||||
}
|
||||
}
|
||||
}
|
||||
exec { "Update base cow for $name":
|
||||
environment => ["DIST=$name","APTCACHEHARDLINK=no","HOME=/root"],
|
||||
command => "git-pbuilder update --hookdir /var/cache/pbuilder/hook.d/",
|
||||
path => "/usr/sbin:/usr/bin:/sbin:/bin",
|
||||
user => root,
|
||||
group => root,
|
||||
logoutput => on_failure,
|
||||
onlyif => "$has_cow",
|
||||
}
|
||||
exec { "Update 32-bit base cow for $name":
|
||||
environment => ["ARCH=i386", "DIST=$name","APTCACHEHARDLINK=no","HOME=/root"],
|
||||
command => "linux32 git-pbuilder update --hookdir /var/cache/pbuilder/hook.d/",
|
||||
path => "/usr/sbin:/usr/bin:/sbin:/bin",
|
||||
user => root,
|
||||
group => root,
|
||||
logoutput => on_failure,
|
||||
onlyif => "$has_cow_32",
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
define cowbuilder::debgpg {
|
||||
|
||||
exec { "Add gpg public key $name":
|
||||
command => "gpg --keyserver keys.gnupg.net --recv-key $name",
|
||||
path => "/usr/sbin:/usr/bin:/sbin:/bin",
|
||||
user => root,
|
||||
group => root,
|
||||
logoutput => on_failure,
|
||||
unless => "/usr/bin/gpg --list-keys $name >/dev/null 2>&1",
|
||||
}
|
||||
}
|
||||
@ -1,57 +0,0 @@
|
||||
class cowbuilder {
|
||||
|
||||
$slave_packages = ["git-buildpackage",
|
||||
"pbuilder",
|
||||
"cowbuilder",
|
||||
"linux32",
|
||||
"debian-archive-keyring"]
|
||||
|
||||
$ubuntu_releases = [ "lucid",
|
||||
"maverick",
|
||||
"natty",
|
||||
"oneiric" ]
|
||||
|
||||
$debian_releases = [ "wheezy",
|
||||
"squeeze" ]
|
||||
|
||||
package { $slave_packages:
|
||||
ensure => "latest"
|
||||
}
|
||||
|
||||
file { 'cowhookdir':
|
||||
name => '/var/cache/pbuilder/hook.d',
|
||||
ensure => 'directory',
|
||||
mode => 755,
|
||||
require => Package['pbuilder'],
|
||||
}
|
||||
|
||||
file { 'cowhook':
|
||||
name => '/var/cache/pbuilder/hook.d/E01-enable-repos',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => 755,
|
||||
ensure => 'present',
|
||||
source => "puppet:///modules/cowbuilder/E01-enable-repos",
|
||||
replace => 'true',
|
||||
require => File[cowhookdir]
|
||||
}
|
||||
|
||||
cowbuilder::debgpg { 'AED4B06F473041FA': }
|
||||
|
||||
cowbuilder::cow { $ubuntu_releases:
|
||||
distro => 'ubuntu',
|
||||
require => [ Package[debian-archive-keyring],
|
||||
Package[linux32],
|
||||
File[cowhook]
|
||||
],
|
||||
}
|
||||
cowbuilder::cow { $debian_releases:
|
||||
distro => 'debian',
|
||||
require => [ Package[debian-archive-keyring],
|
||||
Package[linux32],
|
||||
File[cowhook],
|
||||
Cowbuilder::Debgpg[AED4B06F473041FA],
|
||||
],
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
[Tarmac]
|
||||
rejected_branch_status = Work in progress
|
||||
|
||||
[lp:nova]
|
||||
verify_command=/home/jenkins/openstack-ci/test_nova.sh
|
||||
|
||||
[lp:~hudson-openstack/nova/milestone-proposed]
|
||||
verify_command=/home/jenkins/openstack-ci/test_nova.sh
|
||||
|
||||
[lp:openstack-dashboard]
|
||||
verify_command=bash run_tests.sh
|
||||
|
||||
[lp:glance]
|
||||
verify_command=python setup.py test
|
||||
|
||||
[lp:~hudson-openstack/glance/milestone-proposed]
|
||||
verify_command=python setup.py test
|
||||
|
||||
[lp:swift]
|
||||
verify_command=python setup.py test
|
||||
|
||||
[lp:swift/1.1]
|
||||
verify_command=python setup.py test
|
||||
|
||||
[lp:swift/1.2]
|
||||
verify_command=python setup.py test
|
||||
|
||||
[lp:~hudson-openstack/swift/milestone-proposed]
|
||||
verify_command=python setup.py test
|
||||
|
||||
[lp:burrow]
|
||||
verify_command=python setup.py test
|
||||
@ -1,48 +0,0 @@
|
||||
Origin: OpenStack
|
||||
Label: OpenStack
|
||||
Codename: lucid
|
||||
Architectures: i386 amd64 source
|
||||
Components: main
|
||||
Description: OpenStack APT Repository
|
||||
SignWith: yes
|
||||
|
||||
Origin: OpenStack
|
||||
Label: OpenStack
|
||||
Codename: maverick
|
||||
Architectures: i386 amd64 source
|
||||
Components: main
|
||||
Description: OpenStack APT Repository
|
||||
SignWith: yes
|
||||
|
||||
Origin: OpenStack
|
||||
Label: OpenStack
|
||||
Codename: natty
|
||||
Architectures: i386 amd64 source
|
||||
Components: main
|
||||
Description: OpenStack APT Repository
|
||||
SignWith: yes
|
||||
|
||||
Origin: OpenStack
|
||||
Label: OpenStack
|
||||
Codename: oneiric
|
||||
Architectures: i386 amd64 source
|
||||
Components: main
|
||||
Description: OpenStack APT Repository
|
||||
SignWith: yes
|
||||
|
||||
Origin: OpenStack
|
||||
Label: OpenStack
|
||||
Codename: wheezy
|
||||
Architectures: i386 amd64 source
|
||||
Components: main
|
||||
Description: OpenStack APT Repository
|
||||
SignWith: yes
|
||||
|
||||
Origin: OpenStack
|
||||
Label: OpenStack
|
||||
Codename: squeeze
|
||||
Architectures: i386 amd64 source
|
||||
Components: main
|
||||
Description: OpenStack APT Repository
|
||||
SignWith: yes
|
||||
|
||||
@ -1,68 +0,0 @@
|
||||
class reprepro {
|
||||
|
||||
package { "reprepro": ensure => "latest" }
|
||||
|
||||
file { "/srv":
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => 555,
|
||||
ensure => directory,
|
||||
}
|
||||
|
||||
file {"/srv/packages":
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => 555,
|
||||
ensure => directory,
|
||||
require => File["/srv"],
|
||||
}
|
||||
|
||||
file {"/srv/packages/trunk":
|
||||
owner => 'jenkins',
|
||||
group => 'jenkins',
|
||||
mode => 755,
|
||||
ensure => directory,
|
||||
require => [File["/srv/packages"], User[jenkins]]
|
||||
}
|
||||
|
||||
file {"/srv/packages/trunk/conf":
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => 555,
|
||||
ensure => directory,
|
||||
require => File["/srv/packages/trunk"],
|
||||
}
|
||||
|
||||
file {"/srv/packages/trunk/conf/distributions":
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => 444,
|
||||
ensure => 'present',
|
||||
source => "puppet:///modules/reprepro/distributions",
|
||||
}
|
||||
|
||||
file {"/srv/packages/diablo":
|
||||
owner => 'jenkins',
|
||||
group => 'jenkins',
|
||||
mode => 755,
|
||||
ensure => directory,
|
||||
require => [File["/srv/packages"], User[jenkins]]
|
||||
}
|
||||
|
||||
file {"/srv/packages/diablo/conf":
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => 555,
|
||||
ensure => directory,
|
||||
require => File["/srv/packages/diablo"],
|
||||
}
|
||||
|
||||
file {"/srv/packages/diablo/conf/distributions":
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => 444,
|
||||
ensure => 'present',
|
||||
source => "puppet:///modules/reprepro/distributions",
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
# /etc/sudoers
|
||||
#
|
||||
# This file MUST be edited with the 'visudo' command as root.
|
||||
#
|
||||
# See the man page for details on how to write a sudoers file.
|
||||
#
|
||||
|
||||
Defaults env_reset
|
||||
|
||||
# Host alias specification
|
||||
|
||||
# User alias specification
|
||||
|
||||
# Cmnd alias specification
|
||||
|
||||
# User privilege specification
|
||||
root ALL=(ALL) ALL
|
||||
|
||||
# Allow members of group sudo to execute any command after they have
|
||||
# provided their password
|
||||
# (Note that later entries override this, so you might need to move
|
||||
# it further down)
|
||||
%admin ALL=(ALL) NOPASSWD: ALL
|
||||
#
|
||||
#includedir /etc/sudoers.d
|
||||
@ -1,25 +0,0 @@
|
||||
# /etc/sudoers
|
||||
#
|
||||
# This file MUST be edited with the 'visudo' command as root.
|
||||
#
|
||||
# See the man page for details on how to write a sudoers file.
|
||||
#
|
||||
|
||||
Defaults env_reset
|
||||
|
||||
# Host alias specification
|
||||
|
||||
# User alias specification
|
||||
|
||||
# Cmnd alias specification
|
||||
|
||||
# User privilege specification
|
||||
root ALL=(ALL) ALL
|
||||
|
||||
# Allow members of group sudo to execute any command after they have
|
||||
# provided their password
|
||||
# (Note that later entries override this, so you might need to move
|
||||
# it further down)
|
||||
%sudo ALL=(ALL) NOPASSWD: ALL
|
||||
#
|
||||
#includedir /etc/sudoers.d
|
||||
Loading…
Reference in new issue