4 files changed, 18 insertions, 3 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh
index ebc7cac6..5d37a53a 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh
@@ -35,7 +35,7 @@
 
 set -ex
 
-sudo yum -y install devtoolset-4
+sudo yum -y install devtoolset-7
 
-echo "source /opt/rh/devtoolset-4/enable" >> ~/.bashrc
+echo "source /opt/rh/devtoolset-7/enable" >> ~/.bashrc
 
diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh
index b956d6a3..6b569552 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh
@@ -38,13 +38,20 @@ set -ex
 # Remove update notifications and packagekit running in the background
 sudo yum -y remove PackageKit gnome-software
 
+sudo yum-config-manager --enable rhel-server-rhscl-7-rpms
+
 installPackages=()
-installPackages+=(git)
+installPackages+=(rh-git29)
 installPackages+=(zlib-devel)
 installPackages+=(glib2-devel)
 installPackages+=(openssl-devel)
 installPackages+=(freetype-devel)
 installPackages+=(fontconfig-devel)
+# cmake build
+installPackages+=(ninja-build)
+installPackages+=(pcre2-devel)
+installPackages+=(double-conversion-devel)
+installPackages+=(zstd)
 # EGL support
 installPackages+=(mesa-libEGL-devel)
 installPackages+=(mesa-libGL-devel)
@@ -118,6 +125,9 @@ installPackages+=(vulkan-devel)
 
 sudo yum -y install "${installPackages[@]}"
 
+scl enable rh-git29 bash
+sudo ln -s /opt/rh/rh-git29/root/usr/bin/git /usr/local/bin/git
+
 sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3
 sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3
 # We shouldn't use yum to install virtualenv. The one found from package repo is not
diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh
index 062b2790..062b2790 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh
new file mode 100755
index 00000000..5c7f3f1d
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -ex
+
+"$(dirname "$0")/../common/linux/vcpkg.sh"