[elbe-devel] [PATCH] elbepack: drop ELBE_PBUILDER_JOBS

[Thomas Weißschuh]

ELBE_PBUILDER_JOBS would be specified by the user for the elbe client
but evaluated inside the initvm where it is not set.

Drop the non-functional configuration setting.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh at linutronix.de>
---
 elbepack/config.py                       | 4 ----
 elbepack/elbeproject.py                  | 3 +--
 newsfragments/+pbuilder_jobs.removal.rst | 1 +
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/elbepack/config.py b/elbepack/config.py
index 54a1603ee0d7..5a71543b6466 100644
--- a/elbepack/config.py
+++ b/elbepack/config.py
@@ -14,7 +14,6 @@ class Config(dict):
         self['sshport'] = '5022'
         self['elbeuser'] = 'root'
         self['elbepass'] = 'foo'
-        self['pbuilder_jobs'] = 'auto'
         self['initvm_domain'] = 'initvm'
         self['mirrorsed'] = ''
 
@@ -36,9 +35,6 @@ class Config(dict):
         if 'ELBE_PASS' in os.environ:
             self['elbepass'] = os.environ['ELBE_PASS']
 
-        if 'ELBE_PBUILDER_JOBS' in os.environ:
-            self['pbuilder_jobs'] = os.environ['ELBE_PBUILDER_JOBS']
-
         if 'ELBE_INITVM_DOMAIN' in os.environ:
             self['initvm_domain'] = os.environ['ELBE_INITVM_DOMAIN']
 
diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
index c3a5556f10fa..44a8e7470c24 100644
--- a/elbepack/elbeproject.py
+++ b/elbepack/elbeproject.py
@@ -14,7 +14,6 @@ import sys
 
 from elbepack.aptpkgutils import XMLPackage
 from elbepack.cdroms import mk_binary_cdrom, mk_source_cdrom
-from elbepack.config import cfg
 from elbepack.dump import (
     check_full_pkgs,
     dump_debootstrappkgs,
@@ -782,7 +781,7 @@ class ElbeProject:
 
         try:
             debuild_env = {
-                'DEBUILD_DPKG_BUILDPACKAGE_OPTS': ' '.join('-sa', '-j' + cfg['pbuilder_jobs']),
+                'DEBUILD_DPKG_BUILDPACKAGE_OPTS': '-sa -jauto',
                 'DEB_BUILD_PROFILES': profile.replace(',', ' '),
                 'DEB_BUILD_OPTIONS': ' '.join(deb_build_opts),
             }
diff --git a/newsfragments/+pbuilder_jobs.removal.rst b/newsfragments/+pbuilder_jobs.removal.rst
new file mode 100644
index 000000000000..1a3a36a56d81
--- /dev/null
+++ b/newsfragments/+pbuilder_jobs.removal.rst
@@ -0,0 +1 @@
+Drop non-functional `$ELBE_PBUILDER_JOBS` configuration variable.

---
base-commit: 1c26a54d115b5072918f74a80e649687d4820e24
change-id: 20240619-pbuilder_jobs-8c6bb97489cc

Best regards,
-- 
Thomas Weißschuh <thomas.weissschuh at linutronix.de>