starlingx/tools
Code Issues Proposed changes

Merge "debian: define extra env vars for docker apps"

Browse Source
This commit is contained in:
Zuul 2022-04-27 00:53:31 +00:00 committed by Gerrit Code Review
commit f8b5c6f5fa
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stx.conf.sample
View File

@ -8,7 +8,9 @@ proxyport = 8080
buildbranch = master
manifest = default.xml
ostree_osname = debian
debian_distribution = bullseye
debian_snapshot = http://snapshot.debian.org/archive/debian/20220331T000000Z
debian_security_snapshot = http://snapshot.debian.org/archive/debian-security/20220331T000000Z
[builder]
uid = 1000

4
stx/lib/stx/stx_control.py
View File

@ -88,6 +88,8 @@ class HandleControlTask:
dsclist = self.config.get('repomgr', 'dsclist')
ostree_osname = self.config.get('project', 'ostree_osname')
debian_snapshot = self.config.get('project', 'debian_snapshot')
debian_security_snapshot = self.config.get('project', 'debian_security_snapshot')
debian_distribution = self.config.get('project', 'debian_distribution')
if sourceslist:
if not (deblist or dsclist):
self.logger.warning('*************************************\
@ -161,6 +163,8 @@ stx-pkgbuilder/configmap/')
line = line.replace("@CENGNSTRATEGY@", cengnstrategy)
line = line.replace("@OSTREE_OSNAME@", ostree_osname)
line = line.replace("@DEBIAN_SNAPSHOT@", debian_snapshot)
line = line.replace("@DEBIAN_SECURITY_SNAPSHOT@", debian_security_snapshot)
line = line.replace("@DEBIAN_DISTRIBUTION@", debian_distribution)
line = line.replace("@MAX_CPUS@", max_cpus)
if sourceslist:
line = line.replace("@fetch@", "true")

6
stx/stx-build-tools-chart/stx-builder/configmap/localrc.sample
View File

@ -55,6 +55,10 @@ export BUILDER_URL=http://@PROJECT@-stx-pkgbuilder:8080/pkgbuilder/
export OSTREE_OSNAME=@OSTREE_OSNAME@
export DEBIAN_SNAPSHOT=@DEBIAN_SNAPSHOT@
export DEBIAN_SNAPSHOT="@DEBIAN_SNAPSHOT@"
export DEBIAN_SECURITY_SNAPSHOT="@DEBIAN_SECURITY_SNAPSHOT@"
export DEBIAN_DISTRIBUTION="@DEBIAN_DISTRIBUTION@"
export MAX_CPUS=@MAX_CPUS@