starlingx/tools
Code Issues Proposed changes

stx tool: Add the env variable CENGN_STRATEGY

Browse Source 
Add the environment variable CENGN_STRATEGY for supporting CENGN.
Set the default value to 'cengn_first', and we also can set the value
to the other three value 'cengn', 'upstream' or 'upstream_first'.

Story: 2008862
Task: 44361

Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
Change-Id: I0326da798e808dce1b6fefd49e54f54ca41e8bcd
This commit is contained in:
Zhixiong Chi 2022-01-26 14:34:59 +08:00
parent aa6391190f
commit c8d48e39d1
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
stx.conf.sample
View File

@ -24,6 +24,7 @@ mode = local
[repomgr] [repomgr]
type = aptly type = aptly
cengnurl = http://mirror.starlingx.cengn.ca:80/mirror cengnurl = http://mirror.starlingx.cengn.ca:80/mirror
cengnstrategy = cengn_first
sourceslist = sourceslist =
deblist = deblist =
dsclist = dsclist =

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

@ -84,6 +84,7 @@ class HandleControlTask:
buildbranch = self.stxconfig.getConfig('project', 'buildbranch') buildbranch = self.stxconfig.getConfig('project', 'buildbranch')
manifest = self.stxconfig.getConfig('project', 'manifest') manifest = self.stxconfig.getConfig('project', 'manifest')
cengnurl = self.stxconfig.getConfig('repomgr', 'cengnurl') cengnurl = self.stxconfig.getConfig('repomgr', 'cengnurl')
cengnstrategy = self.stxconfig.getConfig('repomgr', 'cengnstrategy')
sourceslist = self.stxconfig.getConfig('repomgr', 'sourceslist') sourceslist = self.stxconfig.getConfig('repomgr', 'sourceslist')
deblist = self.stxconfig.getConfig('repomgr', 'deblist') deblist = self.stxconfig.getConfig('repomgr', 'deblist')
dsclist = self.stxconfig.getConfig('repomgr', 'dsclist') dsclist = self.stxconfig.getConfig('repomgr', 'dsclist')
@ -158,6 +159,7 @@ stx-pkgbuilder/configmap/')
line = line.replace("@MANIFEST@", manifest) line = line.replace("@MANIFEST@", manifest)
line = line.replace("@HOSTUSERNAME@", hostusername) line = line.replace("@HOSTUSERNAME@", hostusername)
line = line.replace("@CENGNURL@", cengnurl) line = line.replace("@CENGNURL@", cengnurl)
line = line.replace("@CENGNSTRATEGY@", cengnstrategy)
line = line.replace("@OSTREE_OSNAME@", ostree_osname) line = line.replace("@OSTREE_OSNAME@", ostree_osname)
line = line.replace("@MAX_CPUS@", max_cpus) line = line.replace("@MAX_CPUS@", max_cpus)
if sourceslist: if sourceslist:

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

@ -38,6 +38,9 @@ export HOSTUSERNAME=@HOSTUSERNAME@
export CENGNURL=@CENGNURL@ export CENGNURL=@CENGNURL@
# CENGN_STRATEGY value: [ cengn|cengn_first|upstream|upstream_first ]
export CENGN_STRATEGY=@CENGNSTRATEGY@
if [[ x"@fetch@" == x"true" ]];then if [[ x"@fetch@" == x"true" ]];then
export SOURCESLIST=/usr/local/bin/stx/@SOURCESLIST@ export SOURCESLIST=/usr/local/bin/stx/@SOURCESLIST@
export DEBLIST=/usr/local/bin/stx/@DEBLIST@ export DEBLIST=/usr/local/bin/stx/@DEBLIST@