From 4da8e2fdc765a26ff1c73d4003ef3be378320a23 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 4 Dec 2015 15:26:57 -0500
Subject: [PATCH] Remove the last little 2.6 bits

We don't need jjb macros or zuul functions, because 2.6 is no longer.

Change-Id: I030ee1bcc0292f4f88ba265e380cf7a0df2d8395
---
 dev/zuul/openstack_functions.py | 5 -----
 jenkins/jobs/macros.yaml        | 5 -----
 zuul/openstack_functions.py     | 5 -----
 3 files changed, 15 deletions(-)

diff --git a/dev/zuul/openstack_functions.py b/dev/zuul/openstack_functions.py
index 89c823862c..7656258605 100644
--- a/dev/zuul/openstack_functions.py
+++ b/dev/zuul/openstack_functions.py
@@ -90,7 +90,6 @@ def set_node_options(item, job, params, default):
     params['OFFLINE_NODE_WHEN_COMPLETE'] = '1'
     proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-updates?)$'  # noqa
     release_re = r'^.*-(jenkinsci|mavencentral|pypi-(both|wheel))-upload$'
-    python26_re = r'^.*-(py(thon)?)?26.*$'
     centos6_re = r'^.*-centos6.*$'
     f20_re = r'^.*-f20.*$'
     f21_re = r'^.*-f21.*$'
@@ -100,10 +99,6 @@ def set_node_options(item, job, params, default):
     # jobs run on the proposal worker
     if re.match(proposal_re, job.name) or re.match(release_re, job.name):
         reusable_node(item, job, params)
-    # Jobs needing python26
-    elif re.match(python26_re, job.name):
-        # Pass because job specified label is always correct.
-        pass
     # Jobs needing centos6
     elif re.match(centos6_re, job.name):
         # Pass because job specified label is always correct.
diff --git a/jenkins/jobs/macros.yaml b/jenkins/jobs/macros.yaml
index 88e7e3437a..a4841506a5 100644
--- a/jenkins/jobs/macros.yaml
+++ b/jenkins/jobs/macros.yaml
@@ -476,11 +476,6 @@
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/run-jsbuild.sh {command}"
 
-- builder:
-    name: python26
-    builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh py26"
-
 - builder:
     name: python27
     builders:
diff --git a/zuul/openstack_functions.py b/zuul/openstack_functions.py
index 052b96d804..cab8947f1f 100644
--- a/zuul/openstack_functions.py
+++ b/zuul/openstack_functions.py
@@ -95,7 +95,6 @@ def set_node_options(item, job, params, default):
     proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-(constraints-.*|updates?|update-liberty))$'  # noqa
     release_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel)|npm)-upload$'
     hook_re = r'^hook-(.*?)-(rtfd)$'
-    python26_re = r'^.*-(py(thon)?)?26.*$'
     centos6_re = r'^.*-centos6.*$'
     fedora_re = r'^.*-f(edora-)?2(1|2|3).*$'
     tripleo_re = r'^.*-tripleo-ci.*$'
@@ -108,10 +107,6 @@ def set_node_options(item, job, params, default):
     if (re.match(proposal_re, job.name) or re.match(release_re, job.name) or
             re.match(hook_re, job.name)):
         reusable_node(item, job, params)
-    # Jobs needing python26
-    elif re.match(python26_re, job.name):
-        # Pass because job specified label is always correct.
-        pass
     # Kolla build image jobs always have the correct node label.
     # Put before distro specific overrides as they list distros in
     # the jobs names unrelated to where job should run.