commit 1973054e2f232f46dfcf99645c6e58c1f46ed051 Author: Nicolas Vigier boklm@torproject.org Date: Wed Apr 21 18:50:46 2021 +0200
Bug 40285: Make projects/container-image use origin_step --- projects/container-image/config | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/projects/container-image/config b/projects/container-image/config index e1274f2..721da60 100644 --- a/projects/container-image/config +++ b/projects/container-image/config @@ -5,8 +5,8 @@ pkg_type: build var: container: use_container: 1 - suite: '[% pc(c("origin_project"), "var/container/suite") %]' - arch: '[% pc(c("origin_project"), "var/container/arch") %]' + suite: '[% pc(c("origin_project"), "var/container/suite", { step => c("origin_step") }) %]' + arch: '[% pc(c("origin_project"), "var/container/arch", { step => c("origin_step") }) %]'
lsb_release: id: Debian @@ -31,8 +31,8 @@ pre: | # Update the package cache so the container installs the most recent # version of required packages. apt-get update -y -q - [% IF pc(c('origin_project'), 'var/pre_pkginst') -%] - [% pc(c('origin_project'), 'var/pre_pkginst') %] + [% IF pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) -%] + [% pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) %] # Update the package cache again because `pre_pkginst` may change the # package manager configuration. apt-get update -y -q @@ -40,14 +40,14 @@ pre: | apt-get upgrade -y -q [% deps = []; - IF pc(c('origin_project'), 'var/deps'); - CALL deps.import(pc(c('origin_project'), 'var/deps')); + IF pc(c('origin_project'), 'var/deps', { step => c('origin_step') }); + CALL deps.import(pc(c('origin_project'), 'var/deps', { step => c('origin_step') })); END; - IF pc(c('origin_project'), 'var/arch_deps'); - CALL deps.import(pc(c('origin_project'), 'var/arch_deps')); + IF pc(c('origin_project'), 'var/arch_deps', { step => c('origin_step') }); + CALL deps.import(pc(c('origin_project'), 'var/arch_deps', { step => c('origin_step') })); END; IF deps.size; - IF pc(c('origin_project'), 'var/sort_deps'); + IF pc(c('origin_project'), 'var/sort_deps', { step => c('origin_step') }); deps = deps.sort; END; FOREACH pkg IN deps; @@ -59,8 +59,8 @@ pre: | END; END; -%] - [% IF pc(c('origin_project'), 'var/post_pkginst') -%] - [% pc(c('origin_project'), 'var/post_pkginst') %] + [% IF pc(c('origin_project'), 'var/post_pkginst', { step => c('origin_step') }) -%] + [% pc(c('origin_project'), 'var/post_pkginst', { step => c('origin_step') }) %] [% END -%]
remote_get: |