From 4dd3960ab34f7590fdf4df3d98abd00ace9c3a47 Mon Sep 17 00:00:00 2001
From: Richard Lau <rlau@redhat.com>
Date: Fri, 9 Jul 2021 15:02:16 +0100
Subject: [PATCH 1/2] ansible: downgrade to Python 3.7 on Ubuntu 16.04

On Ubuntu 16.04 the `python3-pip` package is not compatible with
Python 3.8 and later. Downgrade Python 3 to Python 3.7 which is
new enough for building current Node.js (Python 3.6 or later) but
still compatible with the `python3-pip` package.
---
 ansible/roles/baselayout/tasks/main.yml | 2 +-
 ansible/roles/baselayout/vars/main.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/baselayout/tasks/main.yml b/ansible/roles/baselayout/tasks/main.yml
index 962faca83..19bae0007 100644
--- a/ansible/roles/baselayout/tasks/main.yml
+++ b/ansible/roles/baselayout/tasks/main.yml
@@ -132,7 +132,7 @@
   alternatives:
     link: "/usr/bin/python3"
     name: python3
-    path: "/usr/bin/python3.9"
+    path: "/usr/bin/python3.7"
 
 - name: freebsd | update python package alternatives
   when: os == "freebsd11"
diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml
index d6e275cf5..b38da8937 100644
--- a/ansible/roles/baselayout/vars/main.yml
+++ b/ansible/roles/baselayout/vars/main.yml
@@ -153,7 +153,7 @@ packages: {
 
   # Default gcc/g++ package is 5.
   ubuntu1604: [
-    'gcc-8,g++-8,gcc-6,g++-6,python3.9,python3.9-distutils',
+    'gcc-8,g++-8,gcc-6,g++-6,python3.7,python3.7-distutils',
   ],
 
   # Default gcc/g++ package is 7.

From e24fb8eaf22b355bed5414d3bf84ee3c82d4ea9a Mon Sep 17 00:00:00 2001
From: Richard Lau <rlau@redhat.com>
Date: Fri, 9 Jul 2021 16:21:18 +0100
Subject: [PATCH 2/2] jenkins: set `GCOV` on Ubuntu to match `CC`/`CXX`

Code coverage runs `gcov` but this needs to match the version of
gcc/g++ used.
---
 jenkins/scripts/select-compiler.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jenkins/scripts/select-compiler.sh b/jenkins/scripts/select-compiler.sh
index 98e513819..d3df99647 100644
--- a/jenkins/scripts/select-compiler.sh
+++ b/jenkins/scripts/select-compiler.sh
@@ -168,10 +168,12 @@ elif [ "$SELECT_ARCH" = "X64" ]; then
       if [ "$NODEJS_MAJOR_VERSION" -gt "15" ]; then
         export CC="ccache gcc-8"
         export CXX="ccache g++-8"
+        export GCOV="gcov-8"
         export LINK="g++-8"
       else
         export CC="ccache gcc-6"
         export CXX="ccache g++-6"
+        export GCOV="gcov-6"
         export LINK="g++-6"
       fi
       echo "Compiler set to GCC" `$CXX -dumpversion`