summaryrefslogtreecommitdiffstats
path: root/jenkins_jobs/builder.py
diff options
context:
space:
mode:
authorSorin Sbarnea <ssbarnea@redhat.com>2017-05-10 12:53:58 +0100
committerSorin Sbarnea <ssbarnea@redhat.com>2017-08-09 17:51:00 +0100
commit6a9d5736d6306d4db24af0129574dc8a929fd462 (patch)
tree472b039fb5b6a3f7e9e2b17916f38dc924a3bc6a /jenkins_jobs/builder.py
parent2c60aff80675c50baf1fe132b92cfd4232be0cfa (diff)
downloadpython-jenkins-job-builder-6a9d5736d6306d4db24af0129574dc8a929fd462.tar.gz
python-jenkins-job-builder-6a9d5736d6306d4db24af0129574dc8a929fd462.tar.xz
python-jenkins-job-builder-6a9d5736d6306d4db24af0129574dc8a929fd462.zip
use alphanum sorting for jobs and views
This improves UX by using a alphanum sorting which is more natural to humans: [a1, a2, a10] instead of [a1, a10, a2]. Change-Id: Ice9c3de282f08e85c8f8a34a27d1b6c0502ca9cb Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
Diffstat (limited to 'jenkins_jobs/builder.py')
-rw-r--r--jenkins_jobs/builder.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/jenkins_jobs/builder.py b/jenkins_jobs/builder.py
index 1aea1e2f..238be932 100644
--- a/jenkins_jobs/builder.py
+++ b/jenkins_jobs/builder.py
@@ -19,7 +19,6 @@ import errno
import hashlib
import io
import logging
-import operator
import os
from pprint import pformat
import re
@@ -28,6 +27,7 @@ import xml.etree.ElementTree as XML
import jenkins
+from jenkins_jobs.alphanum import AlphanumSort
from jenkins_jobs.cache import JobCache
from jenkins_jobs.constants import MAGIC_MANAGE_STRING
from jenkins_jobs.parallel import concurrent
@@ -199,7 +199,7 @@ class JenkinsManager(object):
orig = time.time()
logger.info("Number of jobs generated: %d", len(xml_jobs))
- xml_jobs.sort(key=operator.attrgetter('name'))
+ xml_jobs.sort(key=AlphanumSort)
if (output and not hasattr(output, 'write') and
not os.path.isdir(output)):
@@ -360,7 +360,7 @@ class JenkinsManager(object):
orig = time.time()
logger.info("Number of views generated: %d", len(xml_views))
- xml_views.sort(key=operator.attrgetter('name'))
+ xml_views.sort(key=AlphanumSort)
if output:
# ensure only wrapped once