public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: "alexander.heinisch via isar-users" <isar-users@googlegroups.com>
To: isar-users@googlegroups.com, felix.moessbauer@siemens.com
Cc: Alexander Heinisch <alexander.heinisch@siemens.com>
Subject: [PATCH 2/3] Added Kconfig for cached snapshot mirror
Date: Fri, 27 Sep 2024 21:06:49 +0200	[thread overview]
Message-ID: <20240927190650.128263-3-alexander.heinisch@siemens.com> (raw)
In-Reply-To: <20240927190650.128263-1-alexander.heinisch@siemens.com>

From: Alexander Heinisch <alexander.heinisch@siemens.com>

Signed-off-by: Alexander Heinisch <alexander.heinisch@siemens.com>
---
 kas/opt/Kconfig              | 25 ++++++++++++++++++++++++-
 kas/opt/mirror-snapshot.yaml |  3 +++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/kas/opt/Kconfig b/kas/opt/Kconfig
index 65482e3a..ef08564c 100644
--- a/kas/opt/Kconfig
+++ b/kas/opt/Kconfig
@@ -7,6 +7,15 @@
 menu "Mirror selection"
 	depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || DEBIAN_SID || UBUNTU_FOCAL || UBUNTU_JAMMY
 
+choice
+	prompt "Mirror type selection"
+	default MIRROR_NONE
+
+config MIRROR_NONE
+	bool "Don't use a mirror"
+	help
+	  Use apt urls as specified in apt.list
+
 config MIRROR_DEBIAN
 	bool "Use specific Debian mirror"
 	depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || DEBIAN_SID
@@ -42,7 +51,6 @@ config KAS_INCLUDE_MIRROR_UBUNTU
 
 config USE_APT_SNAPSHOT
 	bool "Use the distros snapshot mirror"
-	depends on !MIRROR_DEBIAN && (DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || DEBIAN_SID || UBUNTU_FOCAL || UBUNTU_JAMMY)
 	help
 		Use a snapshot mirror for the selected distribution. The date is defined by ISAR_APT_SNAPSHOT_TIMESTAMP.
 
@@ -51,6 +59,21 @@ config KAS_INCLUDE_APT_SNAPSHOT
 	default "kas/opt/mirror-snapshot.yaml"
 	depends on USE_APT_SNAPSHOT
 
+config USE_APT_SNAPSHOT_CACHED
+	bool "Use a cache for snapshot mirror"
+	depends on USE_APT_SNAPSHOT
+
+config DISTRO_APT_SNAPSHOT_PREMIRROR_BASE
+	string "Base URL of the snapshot mirror"
+	default "localhost:3142/snapshot.debian.org"
+	depends on USE_APT_SNAPSHOT_CACHED
+	help
+	  Set the premirror base url used for snapshots.
+	  This can either be a local cache (e.g.: localhost:3142/snapshot.debian.org) or
+	  any mirror like snapshot.debian.org used to retrieve snapshots from.
+
+endchoice
+
 endmenu
 
 
diff --git a/kas/opt/mirror-snapshot.yaml b/kas/opt/mirror-snapshot.yaml
index 59fae192..493e1552 100644
--- a/kas/opt/mirror-snapshot.yaml
+++ b/kas/opt/mirror-snapshot.yaml
@@ -7,3 +7,6 @@ header:
 local_conf_header:
   mirror-debian: |
     ISAR_USE_APT_SNAPSHOT = "1"
+
+env:
+  DISTRO_APT_SNAPSHOT_PREMIRROR_BASE: null
-- 
2.43.0

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20240927190650.128263-3-alexander.heinisch%40siemens.com.

  parent reply	other threads:[~2024-09-27 19:07 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-27 19:06 [PATCH 0/3] Added support for apt caching alexander.heinisch via isar-users
2024-09-27 19:06 ` [PATCH 1/3] Added DISTRO_APT_SNAPSHOT_PREMIRROR_BASE to specify the base-url of the mirror used alexander.heinisch via isar-users
2024-10-01 15:18   ` 'Jan Kiszka' via isar-users
2024-09-27 19:06 ` alexander.heinisch via isar-users [this message]
2024-09-27 19:06 ` [PATCH 3/3] Added doc to setup apt cache alexander.heinisch via isar-users
2024-10-08 20:12   ` 'Niedermayr, BENEDIKT' via isar-users
2024-10-01 13:47 ` [PATCH 0/3] Added support for apt caching 'MOESSBAUER, Felix' via isar-users
2024-10-08  5:20 ` Uladzimir Bely
2024-10-08  6:43   ` 'Heinisch, Alexander' via isar-users
2024-10-08 12:38     ` 'Jan Kiszka' via isar-users
2024-10-31 14:46       ` 'MOESSBAUER, Felix' via isar-users
2024-10-31 15:40         ` 'Heinisch, Alexander' via isar-users
2024-10-31 16:26           ` 'MOESSBAUER, Felix' via isar-users
2024-10-31 16:53             ` 'Heinisch, Alexander' via isar-users

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240927190650.128263-3-alexander.heinisch@siemens.com \
    --to=isar-users@googlegroups.com \
    --cc=alexander.heinisch@siemens.com \
    --cc=felix.moessbauer@siemens.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox