From 3d939200891cc3dcf8ec7cccf1c41e622cca21c1 Mon Sep 17 00:00:00 2001
From: Kylian Serrania <kylian.serrania@datadoghq.com>
Date: Wed, 30 Sep 2020 21:34:43 +0200
Subject: [PATCH] Use python3

---
 .circleci/config.yml            | 16 ++++++++--------
 test/utils/check_apt_install.py |  2 +-
 test/utils/check_yum_install.py |  2 +-
 test/utils/systemctl.py         |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6100f49..3b8d209 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,18 +19,18 @@ commands:
 
   setup_ubuntu:
     steps:
-      - run: apt-get update && apt-get install -y curl sudo
+      - run: apt-get update && apt-get install -y curl sudo python3
+      - setup_common
       - run: cp test/utils/systemctl.py /bin/systemctl
       - run: cp test/utils/systemctl.py /bin/systemd
-      - setup_common
 
   setup_centos:
     steps:
       - run: yum -y update
-      - run: yum install -y curl sudo
+      - run: yum install -y curl sudo python3
+      - setup_common
       - run: cp test/utils/systemctl.py /usr/bin/systemctl
       - run: cp test/utils/systemctl.py /usr/bin/systemd
-      - setup_common
 
   install:
     steps:
@@ -46,7 +46,7 @@ commands:
         type: string
         default: "apt"
     steps:
-      - run: python test/utils/check_<<parameters.repo_type>>_install.py --major-version <<parameters.version>>
+      - run: python3 test/utils/check_<<parameters.repo_type>>_install.py --major-version <<parameters.version>>
 
   uninstall:
     steps:
@@ -59,12 +59,12 @@ commands:
         type: string
         default: "apt"
     steps:
-      - run: python test/utils/check_<<parameters.repo_type>>_install.py --not-installed
+      - run: python3 test/utils/check_<<parameters.repo_type>>_install.py --not-installed
 
 jobs:
   agent7_ubuntu:
     docker:
-      - image: ubuntu:bionic-20191202
+      - image: ubuntu:focal
     steps:
       - checkout
       - setup_installed_version:
@@ -96,7 +96,7 @@ jobs:
 
   agent6_ubuntu:
     docker:
-      - image: ubuntu:bionic-20191202
+      - image: ubuntu:focal
     steps:
       - checkout
       - setup_installed_version:
diff --git a/test/utils/check_apt_install.py b/test/utils/check_apt_install.py
index 928330d..451848c 100644
--- a/test/utils/check_apt_install.py
+++ b/test/utils/check_apt_install.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import apt, re, sys
 from helpers import get_options, check_major_version, check_install_info
diff --git a/test/utils/check_yum_install.py b/test/utils/check_yum_install.py
index 22ef767..f8605cc 100644
--- a/test/utils/check_yum_install.py
+++ b/test/utils/check_yum_install.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import yum, sys
 from helpers import get_options, check_major_version, check_install_info
diff --git a/test/utils/systemctl.py b/test/utils/systemctl.py
index e909024..9e169fa 100755
--- a/test/utils/systemctl.py
+++ b/test/utils/systemctl.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python3
 from __future__ import print_function
 
 __copyright__ = "(C) 2016-2019 Guido U. Draheim, licensed under the EUPL"