Skip to content

Commit 8a1d5e2

Browse files
committed
ansible: publish packages with xbps-repodb
1 parent 62a5eb4 commit 8a1d5e2

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

ansible/roles/buildmaster/templates/master.cfg.j2

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ bash -c 'for repo in {hostdir}/binpkgs/multilib {hostdir}/binpkgs/multilib/nonfr
100100
get_pkgs = ['make', 'print_pkgs']
101101
bulk_make = ['make']
102102

103+
stage_to_index = """
104+
bash -c 'XBPS_ARCH={mach} xbps-repodb --index $(for repo in "" debug nonfree multilib multilib/nonfree; do [ -d {hostdir}/binpkgs/$repo ] && echo {hostdir}/binpkgs/$repo; done)'
105+
""".format(hostdir=hostdir, mach=m['mach'])
106+
103107
bulk_clean_step = Git(repourl=bulk_url, branch='master',
104108
mode='incremental', haltOnFailure=True,
105109
logEnviron=False, progress=True, workdir=bulkdir,
@@ -135,6 +139,11 @@ bash -c 'for repo in {hostdir}/binpkgs/multilib {hostdir}/binpkgs/multilib/nonfr
135139
descriptionDone=[WithProperties("Finished building packages: %s", 'pkgs')],
136140
workdir=builddir, haltOnFailure=True, usePTY=True, timeout=14400,
137141
decodeRC={0:SUCCESS,1:FAILURE,2:FAILURE})
142+
stage_to_index_step = ShellCommand(command=stage_to_index, logEnviron=False,
143+
description="Moving packages from stage to index",
144+
descriptionDone="Packages moved to index",
145+
workdir='.', haltOnFailure=True, usePTY=True, timeout=14400,
146+
decodeRC={0:SUCCESS,1:FAILURE,2:FAILURE})
138147
remove_obsoletes_step = ShellCommand(command=RemoveObsoletes, logEnviron=False,
139148
description=["Removing obsolete packages"],
140149
descriptionDone=["Finished removing obsolete packages"],
@@ -149,7 +158,7 @@ bash -c 'for repo in {hostdir}/binpkgs/multilib {hostdir}/binpkgs/multilib/nonfr
149158
m['bulk_factory_steps'] = [
150159
bulk_clean_step, git_clean_step, bootinst_step,
151160
bootup_step, conf_step, get_pkgs_step, make_step,
152-
remove_obsoletes_step
161+
unstage_step, remove_obsoletes_step
153162
]
154163

155164
# since i686 writes the x86_64 multilib repository,

0 commit comments

Comments
 (0)