diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-08-11 10:46:41 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-08-14 07:12:47 +0000 |
| commit | 1b9efd00e23831678d4cfb020693a3b1286eeb43 (patch) | |
| tree | 602fef117a9de1761c1ca51af8a34513115d6aa5 | |
| parent | d6d96992bc218c893276ba5f04680938b6a32e26 (diff) | |
Remove all *.ci.local network addresses
The dot-local addresses cause problems with mDNS lookups, replace
all with *.intra.qt.io aliases that are now available.
Task-number: QTBUG-60153
Change-Id: Icbcae2f473600342f3cc09e0d1c3d8fa58bc7494
(cherry picked from commit 8556798b4ec9e703deb398c09d88e68c2af4cd54)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rw-r--r-- | classes/internal-build.bbclass | 28 | ||||
| -rwxr-xr-x | scripts/upload.sh | 2 |
2 files changed, 15 insertions, 15 deletions
diff --git a/classes/internal-build.bbclass b/classes/internal-build.bbclass index 72498cb3..ccf97bee 100644 --- a/classes/internal-build.bbclass +++ b/classes/internal-build.bbclass @@ -22,25 +22,25 @@ python enable_internal_build () { import socket try: - socket.gethostbyname('yocto-cache.ci.local') + socket.gethostbyname('yocto-cache.intra.qt.io') except: return e.data.setVar('ENABLE_QTQUICKCOMPILER', "1") - e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH") + e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.intra.qt.io/sstate-caches/${DISTRO_CODENAME}/PATH") e.data.setVar('PREMIRRORS', "\ - ftp://.*/.* http://yocto-cache.ci.local/sources/ \n \ - http://.*/.* http://yocto-cache.ci.local/sources/ \n \ - https://.*/.* http://yocto-cache.ci.local/sources/ \n \ - bzr://.*/.* http://yocto-cache.ci.local/sources/ \n \ - cvs://.*/.* http://yocto-cache.ci.local/sources/ \n \ - git://.*/.* http://yocto-cache.ci.local/sources/ \n \ - gitsm://.*/.* http://yocto-cache.ci.local/sources/ \n \ - hg://.*/.* http://yocto-cache.ci.local/sources/ \n \ - osc://.*/.* http://yocto-cache.ci.local/sources/ \n \ - p4://.*/.* http://yocto-cache.ci.local/sources/ \n \ - svk://.*/.* http://yocto-cache.ci.local/sources/ \n \ - svn://.*/.* http://yocto-cache.ci.local/sources/ \n \ + ftp://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ + http://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ + https://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ + bzr://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ + cvs://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ + git://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ + gitsm://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ + hg://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ + osc://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ + p4://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ + svk://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ + svn://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ ") } diff --git a/scripts/upload.sh b/scripts/upload.sh index e59a3f6d..a30cc32d 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -24,7 +24,7 @@ set -x set -e RELEASE=$(grep PV ../sources/meta-qt5/recipes-qt/qt5/qt5-git.inc | grep -o [0-9.]*) -UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/ +UPLOADPATH=QT@ci-files02-hki.intra.qt.io:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/ if [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.hdd ]; then 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ |