aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Lidi Zheng <lidiz@google.com>2018-10-23 20:01:17 -0700
committerGravatar Lidi Zheng <lidiz@google.com>2018-10-23 20:01:17 -0700
commita62344e56ab43a0fa9fd382e7e465751261b4a39 (patch)
tree0bc7e5435be082c28d4d67e779a3ae953eb30442
parenta82ba64943e2a25abd967a0096df31b0bb0ad0b0 (diff)
Rename the Dockerfiles
-rw-r--r--templates/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile.template (renamed from templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template)0
-rw-r--r--templates/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile.template (renamed from templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template)0
-rw-r--r--templates/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile.template (renamed from templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template)0
-rw-r--r--templates/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile.template (renamed from templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template)0
-rw-r--r--tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile (renamed from tools/dockerfile/test/python_stretch_27_x64/Dockerfile)0
-rw-r--r--tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile (renamed from tools/dockerfile/test/python_stretch_35_x64/Dockerfile)0
-rw-r--r--tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile (renamed from tools/dockerfile/test/python_stretch_36_x64/Dockerfile)0
-rw-r--r--tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile (renamed from tools/dockerfile/test/python_stretch_37_x64/Dockerfile)0
-rwxr-xr-xtools/run_tests/run_tests.py2
9 files changed, 1 insertions, 1 deletions
diff --git a/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile.template
index a1c9d9f84d..a1c9d9f84d 100644
--- a/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile.template
diff --git a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile.template
index 93b655ea0d..93b655ea0d 100644
--- a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile.template
diff --git a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile.template
index a5dcf196f2..a5dcf196f2 100644
--- a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile.template
diff --git a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile.template
index ff342db493..ff342db493 100644
--- a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile.template
diff --git a/tools/dockerfile/test/python_stretch_27_x64/Dockerfile b/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile
index a7a8174db4..a7a8174db4 100644
--- a/tools/dockerfile/test/python_stretch_27_x64/Dockerfile
+++ b/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile
diff --git a/tools/dockerfile/test/python_stretch_35_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile
index 0e97e77e2f..0e97e77e2f 100644
--- a/tools/dockerfile/test/python_stretch_35_x64/Dockerfile
+++ b/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile
diff --git a/tools/dockerfile/test/python_stretch_36_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile
index 9b16b2d3a1..9b16b2d3a1 100644
--- a/tools/dockerfile/test/python_stretch_36_x64/Dockerfile
+++ b/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile
diff --git a/tools/dockerfile/test/python_stretch_37_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile
index add1cc509d..add1cc509d 100644
--- a/tools/dockerfile/test/python_stretch_37_x64/Dockerfile
+++ b/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 5dcdd3700c..b7ed529762 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -762,7 +762,7 @@ class PythonLanguage(object):
if self.args.compiler in [
'python2.7', 'python3.5', 'python3.6', 'python3.7'
]:
- return 'stretch_%s' % re.sub(r'\D*', '', self.args.compiler)
+ return 'stretch_' + self.args.compiler[len('python'):]
elif self.args.compiler == 'python_alpine':
return 'alpine'
else: