Readd cmake backport to Jessie

templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template

@@ -20,6 +20,7 @@
   <%include file="../../gcp_api_libraries.include"/>
   <%include file="../../python_deps.include"/>
   <%include file="../../cxx_deps.include"/>
+  <%include file="../../cmake_jessie_backports.include"/>
   <%include file="../../run_tests_addons.include"/>
   <%include file="../../libuv_install.include"/>
 

templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template

@@ -21,6 +21,7 @@
   <%include file="../../python_deps.include"/>
   <%include file="../../cxx_deps.include"/>
   <%include file="../../run_tests_addons.include"/>
+  <%include file="../../cmake_jessie_backports.include"/>
 
   # Install gcc-4.8 and other relevant items
   RUN apt-get update && apt-get -y install gcc-4.8 gcc-4.8-multilib g++-4.8 g++-4.8-multilib && apt-get clean

tools/dockerfile/test/cxx_jessie_x64/Dockerfile

@@ -72,6 +72,13 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 t
 # C++ dependencies
 RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean
 
+#=================
+# Use cmake 3.6 from jessie-backports
+# should only be used for images based on debian jessie.
+
+RUN echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
+RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean
+
 
 RUN mkdir /var/local/jenkins
 

tools/dockerfile/test/cxx_jessie_x86/Dockerfile

@@ -75,6 +75,13 @@ RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev c
 
 RUN mkdir /var/local/jenkins
 
+#=================
+# Use cmake 3.6 from jessie-backports
+# should only be used for images based on debian jessie.
+
+RUN echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
+RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean
+
 
 # Install gcc-4.8 and other relevant items
 RUN apt-get update && apt-get -y install gcc-4.8 gcc-4.8-multilib g++-4.8 g++-4.8-multilib && apt-get clean

tools/run_tests/run_tests.py

@@ -534,8 +534,7 @@ class CLanguage(object):
         elif compiler == 'clang7.0':
             # clang++-7.0 alias doesn't exist and there are no other clang versions
             # installed.
-            return ('sanitizers_jessie',
-                    self._clang_make_options())
+            return ('sanitizers_jessie', self._clang_make_options())
         else:
             raise Exception('Compiler %s not supported.' % compiler)