mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Add set -ex to provisioning scripts for RHEL 7.4
Task-number: QTQAINFRA-1659 Change-Id: I9e3c1ec559eab29ccb693956201fc2b63f999882 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
This commit is contained in:
Tony Sarajärvi
@@ -33,6 +33,8 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
# refresh local certificates
|
||||
sudo subscription-manager refresh
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -e
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
source $BASEDIR/../common/network_test_server_ip.txt
|
||||
|
||||
@@ -1,2 +1,38 @@
|
||||
#!/bin/bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2017 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## 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 http://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at http://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 2.1 or version 3 as published by the Free
|
||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
## following information to ensure the GNU Lesser General Public License
|
||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
##
|
||||
## As a special exception, The Qt Company gives you certain additional
|
||||
## rights. These rights are described in The Qt Company LGPL Exception
|
||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms
|
||||
|
||||
@@ -33,6 +33,8 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
sudo yum-config-manager --enable rhel-server-rhscl7-rpms
|
||||
sudo yum -y install devtoolset-4
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -e
|
||||
set -ex
|
||||
|
||||
installPackages=()
|
||||
installPackages+=(git)
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
. $BASEDIR/../common/sw_versions.txt
|
||||
|
||||
@@ -35,6 +35,8 @@
|
||||
|
||||
# This script installs CMake 3.6.2
|
||||
|
||||
set -ex
|
||||
|
||||
# CMake is needed for autotests that verify that Qt can be built with CMake
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/cmake_linux.sh"
|
||||
|
||||
@@ -33,4 +33,6 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/qnx_700.sh"
|
||||
|
||||
@@ -33,4 +33,6 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/integrity.sh"
|
||||
|
||||
@@ -33,4 +33,6 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/disable_selinux.sh"
|
||||
|
||||
@@ -34,4 +34,7 @@
|
||||
#############################################################################
|
||||
|
||||
source /opt/rh/devtoolset-4/enable
|
||||
|
||||
set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh"
|
||||
|
||||
@@ -33,4 +33,6 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/android_linux.sh"
|
||||
|
||||
@@ -33,10 +33,10 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
|
||||
|
||||
set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
|
||||
|
||||
packageEpel="epel-release-latest-7.noarch.rpm"
|
||||
OfficialUrl="https://dl.fedoraproject.org/pub/epel/$packageEpel"
|
||||
CachedUrl="http://ci-files01-hki.intra.qt.io/input/redhat/$packageEpel"
|
||||
|
||||
Reference in New Issue
Block a user