Author: Matti Picus <[email protected]>
Branch:
Changeset: r1086:a36c3b0d16d1
Date: 2019-08-08 12:51 +0300
http://bitbucket.org/pypy/buildbot/changeset/a36c3b0d16d1/
Log: add category for aarch64
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -447,7 +447,7 @@
"slavenames": ["aarch64_aws"],
"builddir": AARCH64OWN,
"factory": pypyOwnTestFactory,
- "category": 'linux64',
+ "category": 'aarch64',
"locks": [AARCH64Lock.access('counting')],
},
{"name": LINUX64RPYTHON,
@@ -462,7 +462,7 @@
"slavenames": ["aarch64_aws"],
"builddir": AARCH64RPYTHON,
"factory": pypyRPythonTestFactory,
- "category": 'linux64',
+ "category": 'aarch64',
"locks": [AARCH64Lock.access('counting')],
},
{"name": APPLVLLINUX32,
@@ -518,7 +518,7 @@
'slavenames': ["aarch64_aws"],
'builddir': JITAARCH64,
'factory': pypyJITTranslatedTestFactory64,
- 'category': 'linux64',
+ 'category': 'aarch64',
"locks": [AARCH64Lock.access('counting')],
},
{"name": JITBENCH64,
diff --git a/bot2/pypybuildbot/pypylist.py b/bot2/pypybuildbot/pypylist.py
--- a/bot2/pypybuildbot/pypylist.py
+++ b/bot2/pypybuildbot/pypylist.py
@@ -25,8 +25,9 @@
}
PLATFORM_PRIORITY = {
- 'linux': 100,
- 'linux64': 50,
+ 'linux64': 100,
+ 'linux': 50,
+ 'aarch64': 40,
'osx': 30,
'win32': 20,
's390x': 10,
@@ -38,6 +39,7 @@
PLATFORMS = {
'linux': 'linux-x86-32',
'linux64': 'linux-x86-64',
+ 'aarch64': 'aarch64',
'osx': 'macosx-x86-32',
'osx64': 'macosx-x86-64',
'win32': 'win-x86-32',
diff --git a/bot2/pypybuildbot/summary.py b/bot2/pypybuildbot/summary.py
--- a/bot2/pypybuildbot/summary.py
+++ b/bot2/pypybuildbot/summary.py
@@ -665,6 +665,17 @@
class Summary(HtmlResource):
+ PLATFORM_PRIORITY = {
+ 'linux64': 1,
+ 'linux32': 2,
+ 'aarch64': 3,
+ 'mac64': 4,
+ 'win32': 5,
+ 'linux-s390x': 6,
+ 'linux-armhf': 7,
+ 'benchmark-run': 8,
+ }
+
def __init__(self, categories=[], branch_order_prefixes=[]):
HtmlResource.__init__(self)
self.putChild('longrepr', LongRepr())
@@ -826,13 +837,7 @@
break
else:
branch_key = (len(self.branch_order_prefixes)+1, branch)
- for i, catprefix in enumerate(self.categories):
- if category.startswith(catprefix):
- # kill '-' to make 'linux32' sort before 'linux-armel'
- category = category.replace('-', '')
- break
- else:
- i = len(self.categories)
+ i = self.PLATFORM_PRIORITY.get(category, len(self.categories))
cat_key = (i, category)
return cat_key + branch_key
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
