From 6b830f94578d0bd2d82fd86ecb96a757a1c410a2 Mon Sep 17 00:00:00 2001
From: Natale Patriciello <natale.patriciello@gmail.com>
Date: Mon, 8 Jun 2020 10:59:22 +0200
Subject: [PATCH] ci/cd: Clang10 repo only has python3 packages. Remove python2
 packages from the installed list

---
 utils/tests/gitlab-ci-clang.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/utils/tests/gitlab-ci-clang.yml b/utils/tests/gitlab-ci-clang.yml
index e08295f18..a2a65579a 100644
--- a/utils/tests/gitlab-ci-clang.yml
+++ b/utils/tests/gitlab-ci-clang.yml
@@ -21,7 +21,7 @@
     - echo -en "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-$CLANG main \n deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-$CLANG main" > /etc/apt/sources.list.d/llvm.list
     - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
     - apt-get --quiet update --yes
-    - apt-get --quiet install ca-certificates build-essential clang-$CLANG clang-tools-$CLANG clang-format-$CLANG python-clang-$CLANG libfuzzer-$CLANG-dev lldb-$CLANG lld-$CLANG $EXTRA --yes
+    - apt-get --quiet install ca-certificates build-essential clang-$CLANG clang-tools-$CLANG clang-format-$CLANG libfuzzer-$CLANG-dev lldb-$CLANG lld-$CLANG $EXTRA --yes
   variables:
     COMPILER: clang++-$CLANG
 
@@ -31,21 +31,21 @@ weekly-build-clang-6-debug:
   variables:
     CLANG: "6.0"
     MODE: debug
-    EXTRA: ""
+    EXTRA: python-clang-$CLANG
 
 weekly-build-clang-6-release:
   extends: .weekly-build-clang
   variables:
     CLANG: "6.0"
     MODE: release
-    EXTRA: ""
+    EXTRA: python-clang-$CLANG
 
 weekly-build-clang-6-optimized:
   extends: .weekly-build-clang
   variables:
     CLANG: "6.0"
     MODE: optimized
-    EXTRA: ""
+    EXTRA: python-clang-$CLANG
 
 # CLANG 7
 weekly-build-clang-7-debug:
@@ -53,21 +53,21 @@ weekly-build-clang-7-debug:
   variables:
     CLANG: 7
     MODE: debug
-    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev
+    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev python-clang-$CLANG
 
 weekly-build-clang-7-release:
   extends: .weekly-build-clang
   variables:
     CLANG: 7
     MODE: release
-    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev
+    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev python-clang-$CLANG
 
 weekly-build-clang-7-optimized:
   extends: .weekly-build-clang
   variables:
     CLANG: 7
     MODE: optimized
-    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev
+    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev python-clang-$CLANG
 
 # CLANG 8
 weekly-build-clang-8-debug:
@@ -75,21 +75,21 @@ weekly-build-clang-8-debug:
   variables:
     CLANG: 8
     MODE: debug
-    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev
+    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev python-clang-$CLANG
 
 weekly-build-clang-8-release:
   extends: .weekly-build-clang
   variables:
     CLANG: 8
     MODE: release
-    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev
+    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev python-clang-$CLANG
 
 weekly-build-clang-8-optimized:
   extends: .weekly-build-clang
   variables:
     CLANG: 8
     MODE: optimized
-    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev
+    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev python-clang-$CLANG
 
 # CLANG 9
 weekly-build-clang-9-debug:
@@ -97,21 +97,21 @@ weekly-build-clang-9-debug:
   variables:
     CLANG: 9
     MODE: debug
-    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev
+    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev python-clang-$CLANG
 
 weekly-build-clang-9-release:
   extends: .weekly-build-clang
   variables:
     CLANG: 9
     MODE: release
-    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev
+    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev python-clang-$CLANG
 
 weekly-build-clang-9-optimized:
   extends: .weekly-build-clang
   variables:
     CLANG: 9
     MODE: optimized
-    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev
+    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev python-clang-$CLANG
 
 # CLANG 10
 weekly-build-clang-10-debug:
@@ -119,18 +119,18 @@ weekly-build-clang-10-debug:
   variables:
     CLANG: 10
     MODE: debug
-    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev
+    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev python3-clang-$CLANG
 
 weekly-build-clang-10-release:
   extends: .weekly-build-clang
   variables:
     CLANG: 10
     MODE: release
-    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev
+    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev python3-clang-$CLANG
 
 weekly-build-clang-10-optimized:
   extends: .weekly-build-clang
   variables:
     CLANG: 10
     MODE: optimized
-    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev
+    EXTRA: libc++-$CLANG-dev libc++abi-$CLANG-dev libomp-$CLANG-dev python3-clang-$CLANG