aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2019-11-18 12:56:26 +0200
committerJukka Jokiniva <jukka.jokiniva@qt.io>2019-11-20 12:34:47 +0200
commitf3757051ddb65f933239b20a5bbea61510a6a9e8 (patch)
treec131d64867daa3325a101f0165dc5f3d31803b30
parent4a39410fae8ebc92e5ae02b301dcec842bdd15e4 (diff)
Workaround broken local apt mirror for Ubuntu 16.04
Local mirror is mirroring a public mirror, and for some reason there is a mismatch of file sizes and file hashes for the dep-11 metadata files. More info: https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files Task-number: QTQAINFRA-3351 Change-Id: I736b0c9627399839d713ec637cab9403a368601f Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> (cherry picked from commit b0fb9bbc72ab560f9f338693e92f84f79add82be) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh3
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh3
2 files changed, 6 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh
index bfbb6a8e..909e4288 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh
@@ -44,6 +44,9 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai
sudo systemctl disable $service
done
+# Stop fetching the dep-11 metadata, since our mirrors do not handle them well
+sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled}
+
installPackages+=(git)
installPackages+=(p7zip-full)
installPackages+=(expect)
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
index f2eb6e60..da6d3f5a 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
@@ -44,6 +44,9 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai
sudo systemctl disable $service
done
+# Stop fetching the dep-11 metadata, since our mirrors do not handle them well
+sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled}
+
# aptdaemon is used by update notifiers and similar and there is no point in having those (the symptom is aptd holding a lock)
for i in $(seq 10); do
echo attempting to remove aptdaemon