From 37c980d98a7b0a1acf4fbc4c388f4af034b4acec Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Fri, 28 Aug 2020 14:38:35 +0200
Subject: [PATCH] improve python3 compatibility of the task_runner.py script

---
 tools/run_tests/artifacts/distribtest_targets.py | 12 ++++++++++--
 tools/run_tests/task_runner.py                   |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/run_tests/artifacts/distribtest_targets.py b/tools/run_tests/artifacts/distribtest_targets.py
index 816729e3e8a..2684cda8c4d 100644
--- a/tools/run_tests/artifacts/distribtest_targets.py
+++ b/tools/run_tests/artifacts/distribtest_targets.py
@@ -235,7 +235,9 @@ class PHPDistribTest(object):
         self.platform = platform
         self.arch = arch
         self.docker_suffix = docker_suffix
-        self.labels = ['distribtest', 'php', platform, arch, docker_suffix]
+        self.labels = ['distribtest', 'php', platform, arch]
+        if docker_suffix:
+            self.labels.append(docker_suffix)
 
     def pre_build_jobspecs(self):
         return []
@@ -275,8 +277,14 @@ class CppDistribTest(object):
         self.docker_suffix = docker_suffix
         self.testcase = testcase
         self.labels = [
-            'distribtest', 'cpp', platform, arch, docker_suffix, testcase
+            'distribtest',
+            'cpp',
+            platform,
+            arch,
+            testcase,
         ]
+        if docker_suffix:
+            self.labels.append(docker_suffix)
 
     def pre_build_jobspecs(self):
         return []
diff --git a/tools/run_tests/task_runner.py b/tools/run_tests/task_runner.py
index 067e11a861f..ab180046cb9 100755
--- a/tools/run_tests/task_runner.py
+++ b/tools/run_tests/task_runner.py
@@ -49,7 +49,7 @@ def _create_build_map():
 
     if set(target_build_map.keys()).intersection(label_build_map.keys()):
         raise Exception('Target names need to be distinct from label names')
-    return dict(target_build_map.items() + label_build_map.items())
+    return dict(list(target_build_map.items()) + list(label_build_map.items()))
 
 
 _BUILD_MAP = _create_build_map()
@@ -83,7 +83,7 @@ for label in args.build:
 
 # Among targets selected by -b, filter out those that don't match the filter
 targets = [t for t in targets if all(f in t.labels for f in args.filter)]
-targets = sorted(set(targets))
+targets = sorted(set(targets), key=lambda target: target.name)
 
 # Execute pre-build phase
 prebuild_jobs = []