diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-02-14 09:46:17 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-02-14 09:49:03 +0100 |
| commit | d6d9806883d2d7ac6dd8c30cbb980530f71f55ca (patch) | |
| tree | a751f44743f1b7d5022dd7d355d7b54ed2e4c8b9 /coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh | |
| parent | bb39b8730a8cd622eea4f361940c24371bd05c5a (diff) | |
| parent | fd7bfcc0c50f8b352aaa2c27b01e026589ec4c5b (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Disable a no-gui build on Ubuntu 18.04 for 5.15.
Conflicts:
coin/platform_configs/default.yaml
Task-number: QTQAINFRA-3406
Change-Id: Ida5271d29b89375c045de0c4e6dc20840a0bc748
Diffstat (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh')
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh index 96bf23f8..5198e230 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh @@ -57,6 +57,9 @@ echo "Setting up workaround for Ubuntu systemd resolve bug" sudo rm -f /etc/resolv.conf sudo ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf +# remove hostname to get unique based on IP address +sudo rm /etc/hostname + echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts |