Provisioning: Install python2 for arm mac also

We already use pyenv for installing pytho3 for arm macs, so it is
natural to use the same with python2. Also combining both provisioning
scripts as one, while python2 is already at the end of its lifespan and
should be removed completely from CI nodes.

Task-number: QTQAINFRA-4861
Change-Id: I0f2f73b974a83f8d3f0d42cb02d3b73e5ff82b17
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>

2 files changed, 5 insertions, 60 deletions

diff --git a/coin/provisioning/qtci-macos-12.0-arm/25-python3.sh b/coin/provisioning/qtci-macos-12.0-arm/25-python.sh
index edc87175..f21f3c5e 100755
--- a/coin/provisioning/qtci-macos-12.0-arm/25-python3.sh
+++ b/coin/provisioning/qtci-macos-12.0-arm/25-python.sh
@@ -60,4 +60,9 @@ SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
 /Users/qt/.pyenv/versions/3.9.7/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
 
+# QtWebengine still requires python2
+pyenv install 2.7.18
+SetEnvVar "PYTHON2_PATH" "/Users/qt/.pyenv/versions/2.7.18/bin/"
+
 echo "python3 = 3.9.7" >> ~/versions.txt
+echo "python2 = 2.7.18" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-macos-12.0-arm/25-python2.sh b/coin/provisioning/qtci-macos-12.0-arm/25-python2.sh
deleted file mode 100755
index da1ea956..00000000
--- a/coin/provisioning/qtci-macos-12.0-arm/25-python2.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2021 The Qt Company Ltd.
-## Copyright (C) 2017 Pelagicore AG
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-set -ex
-
-# This script installs python2
-
-# shellcheck source=./InstallPKGFromURL.sh
-source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-# shellcheck source=./pip.sh
-source "${BASH_SOURCE%/*}/../common/macos/pip.sh"
-
-InstallPip python2.7
-
-/usr/local/bin/pip install virtualenv
-
-SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH"
-
-echo "python2 = 2.7.16" >> ~/versions.txt
-