From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995471529792241664 X-Received: by 2002:a05:6512:1183:: with SMTP id g3mr1980797lfr.130.1628760138610; Thu, 12 Aug 2021 02:22:18 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:691e:: with SMTP id e30ls55530lfc.0.gmail; Thu, 12 Aug 2021 02:22:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCwQ9DNZjFZmnEMcJ3fgmN/kW32T5NSbSlVVCaYwJm4gGiTKKri5JSVo5Hzjt6YQvwVNWa X-Received: by 2002:a05:6512:110f:: with SMTP id l15mr1850910lfg.110.1628760137352; Thu, 12 Aug 2021 02:22:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628760137; cv=none; d=google.com; s=arc-20160816; b=W/Qzv6dGz4Kyi9b5cnSMIwXdiTToTMeK3A+meTGOIfFQBfnOuTXq8+KRCs8qbGM3zD DxISotY0PvN3uEludbjxhaIQhZSLInq/4hldJz4eFgZkKExCtHivg26IMcKi9apbmylg U0ZVV87nhFVTGOJMoeeTST1LZuOE/b3MpjInNTkYKIJSaGWbhr9kcJ4nRLYRtxrqHAeG eaJQcjaSjf3NyCH4fmrbMEEub05KLyFcksLNpeMHb9Qj3/V389s5b2UiYetLmC5G5bGe MeYrS5USydFnJjSpfLETboaxQMpTjFzC1hUFxEiWbZqQNmeUWMJx0Li7k8dxskILsZch qmVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:cc:to:subject:from; bh=GSF8xI0Pnp2DA0+LAzYL+K40LiuIpPFZdpP4bYmyUu0=; b=zD5UgEFvqspOmltjVG+anHe9Khu0qXQx0H+SejaHs1dZq8UUavvLRBMnbsZ0k3jw18 HbClILHfEILSix/B+iKKyJQZZbxnX1vWFLj9TjlJTVkgjh0QYsZte2ErLT/VtX2F5b6t weYulLVg0uMVpSIlTCwkt+O224Rqpcr2b2V7I6g8PR+degVKTdtPPc9Ovmpju5c6hgqI ciQvsWPBAAR0RdoSMlMblb6kkPkhKuMGSefmWSVQZB3jJEjZjUcfVcl2JqGLTCvqEoVs XqIlzZRv8pRIvvGuv96h02PN7mKkz9+6Ky8csw7bfQFZW0vnczFyoA5FrOc2sARRxSKi 5jXw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id k40si96339lfv.0.2021.08.12.02.22.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Aug 2021 02:22:17 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 17C9MGux019106 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 12 Aug 2021 11:22:16 +0200 Received: from [167.87.241.87] ([167.87.241.87]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17C9MGhc021194; Thu, 12 Aug 2021 11:22:16 +0200 From: Jan Kiszka Subject: [PATCH] ci: Allow to define DISTRO_APT_PREMIRRORS in build environment To: isar-users Cc: Henning Schild Message-ID: <5c54f4e2-8794-7e00-f131-45487867f9f7@siemens.com> Date: Thu, 12 Aug 2021 11:22:16 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: IWReKd9vAMvE From: Jan Kiszka 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 --- 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