Merge "Stop using py3k-precise nodes"

jenkins/jobs/python-jobs.yaml

@@ -105,26 +105,6 @@
 
     node: '{node}'
 
-- job-template:
-    name: 'gate-{name}-python33'
-
-    wrappers:
-      - build-timeout:
-          timeout: 40
-      - timestamps
-
-    builders:
-      - revoke-sudo
-      - gerrit-git-prep
-      - python33
-      - assert-no-extra-files
-
-    publishers:
-      - test-results
-      - console-log
-
-    node: py3k-precise
-
 - job-template:
     name: 'gate-{name}-python34'
 
@@ -284,7 +264,6 @@
       - 'gate-{name}-pep8'
       - 'gate-{name}-python26'
       - 'gate-{name}-python27'
-      - 'gate-{name}-python33'
       - 'gate-{name}-python34'
       - 'gate-{name}-pypy'
       - 'gate-{name}-docs'

nodepool/elements/nodepool-base/install.d/90-venv-swift-logs

@@ -15,7 +15,5 @@
 # Create a virtualenv for zuul-swift-logs
 # This is in /usr instead of /usr/local due to this bug on precise:
 # https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588
-# Be explicit about the Python version since py3k-precise nodes default
+sudo -H virtualenv /usr/zuul-swift-logs-env
-# to using 3.3 with virtualenv.
-sudo -H virtualenv -p python2 /usr/zuul-swift-logs-env
 sudo -H /usr/zuul-swift-logs-env/bin/pip install python-magic argparse requests

nodepool/elements/puppet/bin/prepare-node

@@ -19,8 +19,6 @@ set -e
 
 SUDO=${SUDO:-true}
 THIN=${THIN:-true}
-PYTHON3=${PYTHON3:-false}
-PYPY=${PYPY:-false}
 ALL_MYSQL_PRIVS=${ALL_MYSQL_PRIVS:-false}
 
 export FACTER_in_chroot=true
@@ -34,8 +32,6 @@ Service {
 class {'openstack_project::single_use_slave':
   sudo => $SUDO,
   thin => $THIN,
-  python3 => $PYTHON3,
-  include_pypy => $PYPY,
   all_mysql_privs => $ALL_MYSQL_PRIVS,
   install_resolv_conf => false
 }

nodepool/scripts/prepare_node.sh

@@ -20,8 +20,6 @@ HOSTNAME=$1
 
 SUDO=${SUDO:-true}
 THIN=${THIN:-true}
-PYTHON3=${PYTHON3:-false}
-PYPY=${PYPY:-false}
 ALL_MYSQL_PRIVS=${ALL_MYSQL_PRIVS:-false}
 GIT_BASE=${GIT_BASE:-git://git.openstack.org}
 
@@ -61,11 +59,11 @@ sudo /bin/bash /root/system-config/install_modules.sh
 set +e
 if [ -z "$NODEPOOL_SSH_KEY" ] ; then
     sudo puppet apply --detailed-exitcodes --modulepath=/root/system-config/modules:/etc/puppet/modules \
-        -e "class {'openstack_project::single_use_slave': sudo => $SUDO, thin => $THIN, python3 => $PYTHON3, include_pypy => $PYPY, all_mysql_privs => $ALL_MYSQL_PRIVS, }"
+        -e "class {'openstack_project::single_use_slave': sudo => $SUDO, thin => $THIN, all_mysql_privs => $ALL_MYSQL_PRIVS, }"
     PUPPET_RET_CODE=$?
 else
     sudo puppet apply --detailed-exitcodes --modulepath=/root/system-config/modules:/etc/puppet/modules \
-        -e "class {'openstack_project::single_use_slave': install_users => false, sudo => $SUDO, thin => $THIN, python3 => $PYTHON3, include_pypy => $PYPY, all_mysql_privs => $ALL_MYSQL_PRIVS, ssh_key => '$NODEPOOL_SSH_KEY', }"
+        -e "class {'openstack_project::single_use_slave': install_users => false, sudo => $SUDO, thin => $THIN, all_mysql_privs => $ALL_MYSQL_PRIVS, ssh_key => '$NODEPOOL_SSH_KEY', }"
     PUPPET_RET_CODE=$?
 fi
 # Puppet doesn't properly return exit codes. Check here the values that
@@ -153,19 +151,15 @@ sudo rm -f /etc/cron.{monthly,weekly,daily,hourly,d}/*
 # Install Zuul into a virtualenv
 # This is in /usr instead of /usr/local due to this bug on precise:
 # https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588
-# Be explicit about the Python version since py3k-precise nodes default
-# to using 3.3 with virtualenv.
 git clone /opt/git/openstack-infra/zuul /tmp/zuul
-sudo virtualenv -p python2 /usr/zuul-env
+sudo virtualenv /usr/zuul-env
 sudo -H /usr/zuul-env/bin/pip install /tmp/zuul
 sudo rm -fr /tmp/zuul
 
 # Create a virtualenv for zuul-swift-logs
 # This is in /usr instead of /usr/local due to this bug on precise:
 # https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588
-# Be explicit about the Python version since py3k-precise nodes default
+sudo -H virtualenv /usr/zuul-swift-logs-env
-# to using 3.3 with virtualenv.
-sudo -H virtualenv -p python2 /usr/zuul-swift-logs-env
 sudo -H /usr/zuul-swift-logs-env/bin/pip install python-magic argparse requests
 
 sync

nodepool/scripts/prepare_node_bare.sh

@@ -20,8 +20,6 @@ HOSTNAME=$1
 
 export SUDO='true'
 export THIN='false'
-export PYTHON='false'
-export PYPY='false'
 export ALL_MYSQL_PRIVS='true'
 
 ./prepare_node.sh "$HOSTNAME"

nodepool/scripts/prepare_node_py3k.sh

@@ -1,29 +0,0 @@
-#!/bin/bash -xe
-
-# Copyright (C) 2011-2014 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
-
-export SUDO='false'
-export THIN='false'
-export PYTHON3='true'
-export PYPY='true'
-export ALL_MYSQL_PRIVS='true'
-
-./prepare_node.sh "$HOSTNAME"
-./fix_pip.sh
-./restrict_memory.sh

zuul/openstack_functions.py

@@ -94,7 +94,6 @@ def set_node_options(item, job, params, default):
     centos6_re = r'^.*-centos6.*$'
     f20_re = r'^.*-f20.*$'
     f21_re = r'^.*-f21.*$'
-    python33_re = r'^.*-(py(thon)?33|33).*$'
     tripleo_re = r'^.*-tripleo.*$'
     devstack_re = r'^.*-dsvm.*$'
     puppetunit_re = r'^gate-puppet-.*-puppet-(lint|syntax|unit).*$'
@@ -117,10 +116,6 @@ def set_node_options(item, job, params, default):
     elif re.match(f21_re, job.name):
         # Pass because job specified label is always correct.
         pass
-    # Jobs needing py33/pypy slaves
-    elif re.match(python33_re, job.name):
-        # Pass because job specified label is always correct.
-        pass
     # Jobs needing tripleo slaves
     elif re.match(tripleo_re, job.name):
         # Pass because job specified label is always correct.