From 7547bafd1ed80ccc0ea4a3f7e15415552c309e99 Mon Sep 17 00:00:00 2001
From: Tero Heikkinen <tero.heikkinen@qt.io>
Date: Thu, 8 Jan 2026 11:11:38 +0200
Subject: [PATCH] Temp quick fix for failing repo-clones in provisioning

Skip repo-clones.ci.qt.io with testserver where it should
use repo-clones-apt.ci.qt.io. Permament fix ongoing.

(related 13487118df13dcc191daafbccf84ec8f9e7e6104)

Pick-to: 6.8 6.5
Task-number: QTQAINFRA-7632
Change-Id: I22bae5dfc96df82bb308233ec895f7164f4cc629
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit f5f14e7b5885256a8901dda5e95b5424774e29e7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../common/shared/testserver/qt_ubuntu_16.04/Dockerfile    | 7 ++++---
 .../common/shared/testserver/qt_ubuntu_18.04/Dockerfile    | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/coin/provisioning/common/shared/testserver/qt_ubuntu_16.04/Dockerfile b/coin/provisioning/common/shared/testserver/qt_ubuntu_16.04/Dockerfile
index a9c8b9ef..adaa2b0a 100644
--- a/coin/provisioning/common/shared/testserver/qt_ubuntu_16.04/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/qt_ubuntu_16.04/Dockerfile
@@ -1,5 +1,6 @@
 FROM ubuntu:16.04
 ARG COIN_RUNS_IN_QT_COMPANY
-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."
+# 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."
diff --git a/coin/provisioning/common/shared/testserver/qt_ubuntu_18.04/Dockerfile b/coin/provisioning/common/shared/testserver/qt_ubuntu_18.04/Dockerfile
index f62a29c6..a16d3983 100644
--- a/coin/provisioning/common/shared/testserver/qt_ubuntu_18.04/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/qt_ubuntu_18.04/Dockerfile
@@ -1,5 +1,6 @@
 FROM ubuntu:18.04
 ARG COIN_RUNS_IN_QT_COMPANY
-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."
+# 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."