Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ansible/roles/buildmaster/templates/master.cfg.j2
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ bash -c 'for repo in {hostdir}/binpkgs/multilib {hostdir}/binpkgs/multilib/nonfr
get_pkgs = ['make', 'print_pkgs']
bulk_make = ['make']

stage_to_index = """
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)'
""".format(hostdir=hostdir, mach=m['mach'])

bulk_clean_step = Git(repourl=bulk_url, branch='master',
mode='incremental', haltOnFailure=True,
logEnviron=False, progress=True, workdir=bulkdir,
Expand Down Expand Up @@ -135,6 +139,11 @@ bash -c 'for repo in {hostdir}/binpkgs/multilib {hostdir}/binpkgs/multilib/nonfr
descriptionDone=[WithProperties("Finished building packages: %s", 'pkgs')],
workdir=builddir, haltOnFailure=True, usePTY=True, timeout=14400,
decodeRC={0:SUCCESS,1:FAILURE,2:FAILURE})
stage_to_index_step = ShellCommand(command=stage_to_index, logEnviron=False,
description="Moving packages from stage to index",
descriptionDone="Packages moved to index",
workdir='.', haltOnFailure=True, usePTY=True, timeout=14400,
decodeRC={0:SUCCESS,1:FAILURE,2:FAILURE})
remove_obsoletes_step = ShellCommand(command=RemoveObsoletes, logEnviron=False,
description=["Removing obsolete packages"],
descriptionDone=["Finished removing obsolete packages"],
Expand All @@ -149,7 +158,7 @@ bash -c 'for repo in {hostdir}/binpkgs/multilib {hostdir}/binpkgs/multilib/nonfr
m['bulk_factory_steps'] = [
bulk_clean_step, git_clean_step, bootinst_step,
bootup_step, conf_step, get_pkgs_step, make_step,
remove_obsoletes_step
stage_to_index_step, remove_obsoletes_step
]

# since i686 writes the x86_64 multilib repository,
Expand Down