From 47717b15362879fc98211e166522b33706636ab8 Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Mon, 15 Jul 2019 11:47:10 +0200
Subject: [PATCH 1/2] build: specify Python version once for all tests

Extracted from #28537 for shorter review cycle.  This makes it easier to experiment with new versions of Python as they become available on the Travis CI platform.
---
 .travis.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f6dc47d8297175..8263d0286adfea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,9 @@ x-ccache-setup-steps: &ccache-setup-steps
 os: linux
 dist: xenial
 language: cpp
+env:
+  global:
+    - PYTHON_VERSION="2.7.15"
 jobs:
   include:
     - stage: "Compile"
@@ -20,7 +23,7 @@ jobs:
             - g++-6
       install: *ccache-setup-steps
       script:
-        - pyenv global 2.7.15
+        - pyenv global ${PYTHON_VERSION}
         - ./configure
         - make -j2 -C out V=1 v8
 
@@ -34,7 +37,7 @@ jobs:
             - g++-6
       install: *ccache-setup-steps
       script:
-        - pyenv global 2.7.15
+        - pyenv global ${PYTHON_VERSION}
         - ./configure
         - make -j2 V=1
         - cp out/Release/node /home/travis/.ccache
@@ -47,7 +50,7 @@ jobs:
         - mkdir -p out/Release
         - cp /home/travis/.ccache/node out/Release/node
       script:
-        - pyenv global 2.7.15
+        - pyenv global ${PYTHON_VERSION}
         - python tools/test.py -j 2 -p dots --report --mode=release --flaky-tests=dontcare default
 
     - name: "Test C++ Suites"
@@ -63,7 +66,7 @@ jobs:
         - cp /home/travis/.ccache/cctest out/Release/cctest
         - touch config.gypi
       script:
-        - pyenv global 2.7.15
+        - pyenv global ${PYTHON_VERSION}
         - out/Release/cctest
         - make -j1 V=1 test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp
         - python tools/test.py -j 2 -p dots --report --mode=release --flaky-tests=dontcare addons js-native-api node-api
@@ -72,7 +75,7 @@ jobs:
       language: node_js
       node_js: "node"
       install:
-        - pyenv global 2.7.15
+        - pyenv global ${PYTHON_VERSION}
         - make lint-py-build || true
       script:
         - NODE=$(which node) make lint lint-py

From 9bed611fa2387871728d3249aa139eb37459c4f8 Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Mon, 15 Jul 2019 13:26:34 +0200
Subject: [PATCH 2/2] Travis CI's default distro is now Xenial

https://blog.travis-ci.com/2019-04-15-xenial-default-build-environment
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8263d0286adfea..82a55c76e19b7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ x-ccache-setup-steps: &ccache-setup-steps
   - export CXX='ccache g++-6'
 
 os: linux
-dist: xenial
 language: cpp
 env:
   global: