From 314c56b3d83e2c7c606c03556ae5a28bbae4cf55 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 30 Jan 2015 17:15:30 +0000 Subject: [PATCH] Stop building py3k-precise nodes The special py3k-precise nodes are no longer needed by any jobs, so stop building them and clean up any custom Puppet related to them. Change-Id: I40d5d09f28ef53583d239d2e852e9c50b5962cf8 Depends-On: Ie105674833e0a527f990a7448855a1090f5dc651 --- .../manifests/single_use_slave.pp | 4 -- modules/openstack_project/manifests/slave.pp | 7 +- .../manifests/slave_common.pp | 13 ---- .../templates/nodepool/nodepool.yaml.erb | 64 ------------------- 4 files changed, 1 insertion(+), 87 deletions(-) diff --git a/modules/openstack_project/manifests/single_use_slave.pp b/modules/openstack_project/manifests/single_use_slave.pp index 6e70691bd6..82a40fde88 100644 --- a/modules/openstack_project/manifests/single_use_slave.pp +++ b/modules/openstack_project/manifests/single_use_slave.pp @@ -12,8 +12,6 @@ class openstack_project::single_use_slave ( $install_resolv_conf = true, $sudo = false, $thin = true, - $python3 = false, - $include_pypy = false, $automatic_upgrades = false, $all_mysql_privs = false, $enable_unbound = true, @@ -42,11 +40,9 @@ class openstack_project::single_use_slave ( } class { 'jenkins::slave': ssh_key => $ssh_key, - python3 => $python3, } class { 'openstack_project::slave_common': - include_pypy => $include_pypy, sudo => $sudo, project_config_repo => $project_config_repo, } diff --git a/modules/openstack_project/manifests/slave.pp b/modules/openstack_project/manifests/slave.pp index c7b1518554..8dc0d83325 100644 --- a/modules/openstack_project/manifests/slave.pp +++ b/modules/openstack_project/manifests/slave.pp @@ -5,8 +5,6 @@ class openstack_project::slave ( $certname = $::fqdn, $ssh_key = '', $sysadmins = [], - $python3 = false, - $include_pypy = false ) { include openstack_project @@ -21,7 +19,6 @@ class openstack_project::slave ( class { 'jenkins::slave': ssh_key => $ssh_key, - python3 => $python3, } include jenkins::cgroups @@ -33,9 +30,7 @@ class openstack_project::slave ( limit_value => '256' } - class { 'openstack_project::slave_common': - include_pypy => $include_pypy, - } + include openstack_project::slave_common if (! $thin) { include openstack_project::thick_slave diff --git a/modules/openstack_project/manifests/slave_common.pp b/modules/openstack_project/manifests/slave_common.pp index 9f93d15735..40d1de86ad 100644 --- a/modules/openstack_project/manifests/slave_common.pp +++ b/modules/openstack_project/manifests/slave_common.pp @@ -3,7 +3,6 @@ # Common configuration between openstack_project::slave and # openstack_project::single_use_slave class openstack_project::slave_common( - $include_pypy = false, $sudo = false, $project_config_repo = '', ){ @@ -85,18 +84,6 @@ class openstack_project::slave_common( refreshonly => true, command => '/sbin/sysctl -p /etc/sysctl.d/10-ptrace.conf', } - - if $include_pypy { - apt::ppa { 'ppa:pypy/ppa': } - package { 'pypy': - ensure => present, - require => Apt::Ppa['ppa:pypy/ppa'] - } - package { 'pypy-dev': - ensure => present, - require => Apt::Ppa['ppa:pypy/ppa'] - } - } } # install linux-headers depending on OS version diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb index 7c111be1d1..cea1bcb0e4 100644 --- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb +++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb @@ -111,19 +111,6 @@ labels: - name: rax-dfw - name: rax-ord - name: rax-iad - - name: py3k-precise - image: py3k-precise - ready-script: configure_mirror.sh - min-ready: 2 - providers: - - name: hpcloud-b1 - - name: hpcloud-b2 - - name: hpcloud-b3 - - name: hpcloud-b4 - - name: hpcloud-b5 - - name: rax-dfw - - name: rax-ord - - name: rax-iad - name: devstack-trusty-2-node image: devstack-trusty ready-script: multinode_setup.sh @@ -262,13 +249,6 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa - - name: py3k-precise - base-image: 'Ubuntu 12.04 LTS (Precise Pangolin)' - min-ram: 8192 - name-filter: 'Performance' - setup: prepare_node_py3k.sh - username: jenkins - private-key: /home/nodepool/.ssh/id_rsa - name: devstack-f20 base-image: 'Fedora 20 (Heisenbug) (PVHVM)' min-ram: 8192 @@ -337,13 +317,6 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa - - name: py3k-precise - base-image: 'Ubuntu 12.04 LTS (Precise Pangolin)' - min-ram: 8192 - name-filter: 'Performance' - setup: prepare_node_py3k.sh - username: jenkins - private-key: /home/nodepool/.ssh/id_rsa - name: devstack-f20 base-image: 'Fedora 20 (Heisenbug) (PVHVM)' min-ram: 8192 @@ -419,13 +392,6 @@ providers: setup: prepare_node_devstack.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa - - name: py3k-precise - base-image: 'Ubuntu 12.04 LTS (Precise Pangolin)' - min-ram: 8192 - name-filter: 'Performance' - setup: prepare_node_py3k.sh - username: jenkins - private-key: /home/nodepool/.ssh/id_rsa - name: devstack-f20 base-image: 'Fedora 20 (Heisenbug) (PVHVM)' min-ram: 8192 @@ -549,12 +515,6 @@ providers: diskimage: devstack-centos7-dib username: jenkins private-key: /home/nodepool/.ssh/id_rsa - - name: py3k-precise - base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140927) - Partner Image' - min-ram: 30720 - setup: prepare_node_py3k.sh - username: jenkins - private-key: /home/nodepool/.ssh/id_rsa - name: hpcloud-b2 region-name: 'region-b.geo-1' service-type: 'compute' @@ -639,12 +599,6 @@ providers: diskimage: devstack-centos7-dib username: jenkins private-key: /home/nodepool/.ssh/id_rsa - - name: py3k-precise - base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140927) - Partner Image' - min-ram: 30720 - setup: prepare_node_py3k.sh - username: jenkins - private-key: /home/nodepool/.ssh/id_rsa - name: hpcloud-b3 region-name: 'region-b.geo-1' service-type: 'compute' @@ -729,12 +683,6 @@ providers: diskimage: devstack-centos7-dib username: jenkins private-key: /home/nodepool/.ssh/id_rsa - - name: py3k-precise - base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140927) - Partner Image' - min-ram: 30720 - setup: prepare_node_py3k.sh - username: jenkins - private-key: /home/nodepool/.ssh/id_rsa - name: hpcloud-b4 region-name: 'region-b.geo-1' service-type: 'compute' @@ -820,12 +768,6 @@ providers: diskimage: devstack-centos7-dib username: jenkins private-key: /home/nodepool/.ssh/id_rsa - - name: py3k-precise - base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140927) - Partner Image' - min-ram: 30720 - setup: prepare_node_py3k.sh - username: jenkins - private-key: /home/nodepool/.ssh/id_rsa - name: hpcloud-b5 region-name: 'region-b.geo-1' service-type: 'compute' @@ -912,12 +854,6 @@ providers: diskimage: devstack-centos7-dib username: jenkins private-key: /home/nodepool/.ssh/id_rsa - - name: py3k-precise - base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20140927) - Partner Image' - min-ram: 30720 - setup: prepare_node_py3k.sh - username: jenkins - private-key: /home/nodepool/.ssh/id_rsa - name: tripleo-test-cloud-hp1 service-type: 'compute' service-name: 'nova'