mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-20 13:32:42 +08:00
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts: coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml Change-Id: I48b1e814dd6328dfb2827d0898a277b81ec25e55
This commit is contained in:
@@ -80,14 +80,22 @@ else
|
||||
sudo chown -R qt:users "$targetFolder"
|
||||
fi
|
||||
|
||||
# Run the following command under `eval` or `sh -c` so that the shell properly splits it
|
||||
sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'"
|
||||
|
||||
echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
|
||||
# shellcheck disable=SC2031
|
||||
if [ "$http_proxy" != "" ]; then
|
||||
proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1)
|
||||
proxy_port=$(echo "$proxy" | cut -d':' -f3)
|
||||
echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"
|
||||
echo "y" | "$sdkTargetFolder/tools/bin/sdkmanager" \
|
||||
--no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" \
|
||||
"platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \
|
||||
| eval $sdkmanager_no_progress_bar_cmd
|
||||
else
|
||||
echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"
|
||||
echo "y" | "$sdkTargetFolder/tools/bin/sdkmanager" \
|
||||
"platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \
|
||||
| eval $sdkmanager_no_progress_bar_cmd
|
||||
fi
|
||||
|
||||
echo "Checking the contents of Android SDK..."
|
||||
@@ -106,8 +114,11 @@ echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
|
||||
echo "Android NDK = $ndkVersion" >> ~/versions.txt
|
||||
|
||||
cd "$sdkTargetFolder/tools/bin"
|
||||
./sdkmanager --install "emulator"
|
||||
echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86"
|
||||
./sdkmanager --install "emulator" \
|
||||
| eval $sdkmanager_no_progress_bar_cmd
|
||||
echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86" \
|
||||
| eval $sdkmanager_no_progress_bar_cmd
|
||||
|
||||
|
||||
echo "Checking the contents of Android SDK again..."
|
||||
ls -l "$sdkTargetFolder"
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v1.4.5 (GNU/Linux)
|
||||
|
||||
mQGiBEyvJq8RBAD64FtKbU3VFsZ4PAzcSi9rETc1qXZLVQYtrE38niriIJUuT/tC
|
||||
kxGjkduD7ozP6rxL+M8fk9UdbbmzhHhXzQT2blyYy2iwpZP5+AFeQawz+oyMRVze
|
||||
x6IY5qO31TiRu+aEBptk6nco4DULlKABlvtjKI+gJ4buJm+TumyrPaxe9wCgpFwl
|
||||
O0fEjpOfQd+6Du0sCnPX7+8D/3xYVj9q5ILmrJ9zehBKjRYEcaP0rZVqudH51FUS
|
||||
I0LQNHsJdzKLzhT+Zj7TJU4KnCN4sX7amfYL3GT9qyZEBDx2alubvEsI36wtNq0i
|
||||
ewU4XmyZ+Rd7Q4mAPNoBGe5DsUA8wn/7iHGg9aJHu+GXvH7T3DVoUxW5W2KqPw+h
|
||||
jzqGBACWGuuCefa683uf6aKqpTS3JB+01BDPf+sG9qJ+k7xcJOsEiXIe1X5vH9ov
|
||||
kEvTM12kzY7SGwlsFsTDT1xioDl62g5nPlZMXErUBVnjoMtjl9bDwUPJY/vP1S9M
|
||||
VaONBMoJEON3HRui9jhdEK25LTdrcFlFpRzJI3AgdXwy8aQyiLRGZGV2ZWw6bGFu
|
||||
Z3VhZ2VzOmdvIE9CUyBQcm9qZWN0IDxkZXZlbDpsYW5ndWFnZXM6Z29AYnVpbGQu
|
||||
b3BlbnN1c2Uub3JnPohmBBMRAgAmBQJc9DoCAhsDBQkUY8NTBgsJCAcDAgQVAggD
|
||||
BBYCAwECHgECF4AACgkQr0z+TTB9e/lQZgCfXIjj30HyCPvUbSbSd6zOS0seAegA
|
||||
n3DXayMpRphNmyJgLvl5qKfsX7f6iEYEExECAAYFAkyvJq8ACgkQOzARt2udZSOg
|
||||
qQCeOba7kjk7CI+64GOkhhTGSdjnjdQAn2IC5tx+PW38XKwl3Jr5YVp0RyR0
|
||||
=AOj6
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
@@ -44,5 +44,5 @@ elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then
|
||||
elif cat /etc/os-release |grep "SUSE Linux Enterprise Server 15"; then
|
||||
sudo timedatectl set-ntp false
|
||||
else
|
||||
(systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off
|
||||
sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off
|
||||
fi
|
||||
|
||||
@@ -49,7 +49,7 @@ echo "$sha1 $targetFile" | sha1sum --check
|
||||
if [ ! -d "$targetFolder" ]; then
|
||||
mkdir -p $targetFolder
|
||||
fi
|
||||
sudo tar -C $targetFolder -xvzf $targetFile
|
||||
sudo tar -C $targetFolder -xzf $targetFile
|
||||
sudo chown -R qt:users "$targetFolder"/"$folderName"
|
||||
|
||||
# Verify that we have last file in tar
|
||||
|
||||
47
coin/provisioning/common/linux/telegraf-coin.conf
Normal file
47
coin/provisioning/common/linux/telegraf-coin.conf
Normal file
@@ -0,0 +1,47 @@
|
||||
[global_tags]
|
||||
[agent]
|
||||
interval = "10s"
|
||||
round_interval = true
|
||||
metric_batch_size = 100
|
||||
metric_buffer_limit = 10000
|
||||
collection_jitter = "0s"
|
||||
flush_interval = "10s"
|
||||
flush_jitter = "5s"
|
||||
precision = ""
|
||||
logfile = "/var/log/telegraf-coin.log"
|
||||
hostname = "$COIN_UNIQUE_JOB_ID"
|
||||
omit_hostname = false
|
||||
[[outputs.influxdb]]
|
||||
urls= ["https://qtinfluxdb01.intra.qt.io:8086"]
|
||||
insecure_skip_verify = true
|
||||
database = "coin_vms"
|
||||
skip_database_creation = true
|
||||
username = "coin_vms_writer"
|
||||
password = "COIN_VMS_WRITER_PASS"
|
||||
[[inputs.cpu]]
|
||||
percpu = true
|
||||
totalcpu = true
|
||||
collect_cpu_time = false
|
||||
report_active = false
|
||||
[[inputs.disk]]
|
||||
ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"]
|
||||
[[inputs.diskio]]
|
||||
[[inputs.kernel]]
|
||||
[[inputs.mem]]
|
||||
[[inputs.processes]]
|
||||
[[inputs.swap]]
|
||||
[[inputs.system]]
|
||||
[[inputs.kernel_vmstat]] # linux-only
|
||||
[[inputs.netstat]]
|
||||
|
||||
|
||||
# Monitor Coin process
|
||||
[[inputs.procstat]]
|
||||
exe = "coin-"
|
||||
pid_finder = "native"
|
||||
|
||||
|
||||
# Monitor I/O latency
|
||||
[[inputs.exec]]
|
||||
data_format = "influx"
|
||||
commands = [ "/usr/bin/telegraf-ioping.sh /" ]
|
||||
Reference in New Issue
Block a user