lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix failing repo-clones in provisioning with correct URL

Browse Source 
Switching repo-clones.ci.qt.io --> repo-clones-apt.ci.qt.io
with testserver where it was missing. Removes temp quick fix.

Replace also ping check towards new repo-clones-apt server.

(amends 13487118df)

Pick-to: 6.10 6.8 6.5
Task-number: QTQAINFRA-7632
Change-Id: Iff32904aeb9c66f4c76cd1dd0e3d468ca0e9dabd
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 51bcd64151)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tero Heikkinen
2026-01-08 12:23:50 +02:00
committed by Qt Cherry-pick Bot
parent 399f581855
commit 398d58c520
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coin/provisioning/common/shared/testserver/qt_ubuntu_16.04/Dockerfile
View File

@@ -1,6 +1,10 @@
FROM ubuntu:16.04
ARG COIN_RUNS_IN_QT_COMPANY
# Temp quick fix: Skip repo-clones usage
#RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
# && sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \
# || echo "Internal package repository not found. Using public repositories."
RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
&& { printf '%s\n' \
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-amd64 main restricted universe multiverse' \
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-updates-amd64 main restricted universe multiverse' \
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-backports-amd64 main restricted universe' \
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-security-amd64 main restricted universe multiverse' \
> /etc/apt/sources.list; \
} \

12
coin/provisioning/common/shared/testserver/qt_ubuntu_18.04/Dockerfile
View File

@@ -1,6 +1,10 @@
FROM ubuntu:18.04
ARG COIN_RUNS_IN_QT_COMPANY
# Temp quick fix: Skip repo-clones usage
#RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
# && sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \
# || echo "Internal package repository not found. Using public repositories."
RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
&& { printf '%s\n' \
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-amd64 main restricted universe multiverse' \
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-updates-amd64 main restricted universe multiverse' \
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-backports-amd64 main restricted universe' \
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-security-amd64 main restricted universe multiverse' \
> /etc/apt/sources.list; \
} \

2
coin/provisioning/common/unix/common.sourced.sh
View File

@@ -116,7 +116,7 @@ set_common_environment () {
CMD_INSTALL="sudo install"
COIN_RUNS_IN_QT_COMPANY=false
if ping -c1 repo-clones.ci.qt.io >/dev/null 2>&1
if ping -c1 repo-clones-apt.ci.qt.io >/dev/null 2>&1
then
COIN_RUNS_IN_QT_COMPANY=true
fi