public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
* [PATCH] ci: Allow to define DISTRO_APT_PREMIRRORS in build environment
@ 2021-08-12  9:22 Jan Kiszka
  2021-08-26  8:56 ` Anton Mikanovich
  0 siblings, 1 reply; 2+ messages in thread
From: Jan Kiszka @ 2021-08-12  9:22 UTC (permalink / raw)
  To: isar-users; +Cc: Henning Schild

From: Jan Kiszka <jan.kiszka@siemens.com>

This can be helpful to direct away from http://deb.debian.org where it
is in conflict with local network conditions.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

A surrender to our IT infrastructure. But maybe we are not alone. In 
fact, I heard deb.debian.org is also not very fast behind the Great 
Firewall.

 .gitlab-ci.yml      | 1 +
 scripts/ci_build.sh | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7fc1612..c91a997 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ variables:
     - export https_proxy=$HTTPS_PROXY
     - export ftp_proxy=$FTP_PROXY
     - export no_proxy=$NO_PROXY
+    - export DISTRO_APT_PREMIRRORS=$DISTRO_APT_PREMIRRORS
   artifacts:
     name: "logs-$CI_JOB_ID"
     paths:
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index a2895f6..a4aa74e 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -168,6 +168,10 @@ ISAR_ENABLE_COMPAT_ARCH_debian-stretch_amd64 = "0"
 IMAGE_INSTALL += "kselftest"
 EOF
 
+if [ -n "$DISTRO_APT_PREMIRRORS" ]; then
+    echo "DISTRO_APT_PREMIRRORS = \"$DISTRO_APT_PREMIRRORS\"" >> conf/local.conf
+fi
+
 if [ -n "$CROSS_BUILD" ]; then
     sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf
 fi
-- 
2.31.1

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] ci: Allow to define DISTRO_APT_PREMIRRORS in build environment
  2021-08-12  9:22 [PATCH] ci: Allow to define DISTRO_APT_PREMIRRORS in build environment Jan Kiszka
@ 2021-08-26  8:56 ` Anton Mikanovich
  0 siblings, 0 replies; 2+ messages in thread
From: Anton Mikanovich @ 2021-08-26  8:56 UTC (permalink / raw)
  To: Jan Kiszka, isar-users; +Cc: Henning Schild

12.08.2021 12:22, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> This can be helpful to direct away from http://deb.debian.org where it
> is in conflict with local network conditions.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

Applied to next, thanks.

-- 
Anton Mikanovich
Promwad Ltd.
External service provider of ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn, Germany
+49 (89) 122 67 24-0
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-08-26  8:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-12  9:22 [PATCH] ci: Allow to define DISTRO_APT_PREMIRRORS in build environment Jan Kiszka
2021-08-26  8:56 ` Anton Mikanovich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox