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) | |
| download | meta-boot2qt-1b9efd00e23831678d4cfb020693a3b1286eeb43.tar.gz | |
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 72498cb..ccf97be 100644 --- a/classes/internal-build.bbclass +++ b/classes/internal-build.bbclass | |||
| @@ -22,25 +22,25 @@ | |||
| 22 | python enable_internal_build () { | 22 | python enable_internal_build () { |
| 23 | import socket | 23 | import socket |
| 24 | try: | 24 | try: |
| 25 | socket.gethostbyname('yocto-cache.ci.local') | 25 | socket.gethostbyname('yocto-cache.intra.qt.io') |
| 26 | except: | 26 | except: |
| 27 | return | 27 | return |
| 28 | 28 | ||
| 29 | e.data.setVar('ENABLE_QTQUICKCOMPILER', "1") | 29 | e.data.setVar('ENABLE_QTQUICKCOMPILER', "1") |
| 30 | e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH") | 30 | e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.intra.qt.io/sstate-caches/${DISTRO_CODENAME}/PATH") |
| 31 | e.data.setVar('PREMIRRORS', "\ | 31 | e.data.setVar('PREMIRRORS', "\ |
| 32 | ftp://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 32 | ftp://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ |
| 33 | http://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 33 | http://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ |
| 34 | https://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 34 | https://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ |
| 35 | bzr://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 35 | bzr://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ |
| 36 | cvs://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 36 | cvs://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ |
| 37 | git://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 37 | git://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ |
| 38 | gitsm://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 38 | gitsm://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ |
| 39 | hg://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 39 | hg://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ |
| 40 | osc://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 40 | osc://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ |
| 41 | p4://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 41 | p4://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ |
| 42 | svk://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 42 | svk://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ |
| 43 | svn://.*/.* http://yocto-cache.ci.local/sources/ \n \ | 43 | svn://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \ |
| 44 | ") | 44 | ") |
| 45 | } | 45 | } |
| 46 | 46 | ||
diff --git a/scripts/upload.sh b/scripts/upload.sh index e59a3f6..a30cc32 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh | |||
| @@ -24,7 +24,7 @@ set -x | |||
| 24 | set -e | 24 | set -e |
| 25 | 25 | ||
| 26 | RELEASE=$(grep PV ../sources/meta-qt5/recipes-qt/qt5/qt5-git.inc | grep -o [0-9.]*) | 26 | RELEASE=$(grep PV ../sources/meta-qt5/recipes-qt/qt5/qt5-git.inc | grep -o [0-9.]*) |
| 27 | UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/ | 27 | UPLOADPATH=QT@ci-files02-hki.intra.qt.io:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/ |
| 28 | 28 | ||
| 29 | if [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.hdd ]; then | 29 | if [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.hdd ]; then |
| 30 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ | 30 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ |
