From 7438adfc4fb86ec761739b491fa755dea9e45ba1 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 4 Oct 2023 12:23:57 +0300 Subject: [PATCH] create repo file for deb + link at fixed url --- master.cfg | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/master.cfg b/master.cfg index 68dac7d2..e185580c 100644 --- a/master.cfg +++ b/master.cfg @@ -185,7 +185,22 @@ f_deb_autobake.addStep(steps.SetPropertyFromCommand(command="find .. -maxdepth 1 f_deb_autobake.addStep(dpkgDeb()) #f_deb_autobake.addStep(steps.MultipleFileUpload(workersrcs=['debs/Packages.gz', 'debs/Sources.gz'], # masterdest=util.Interpolate('/srv/buildbot/packages/' + '%(prop:tarbuildnum)s' + '/' + '%(prop:buildername)s'), mode=0o755, url=util.Interpolate('https://ci.mariadb.org/' + "%(prop:tarbuildnum)s" + "/" + '%(prop:buildername)s' + "/"), doStepIf=lambda step: hasFiles(step) and savePackage(step))) -f_deb_autobake.addStep(steps.ShellCommand(name='save_packages', timeout=7200, haltOnFailure=True, command=util.Interpolate('mkdir -p ' + '/packages/' + '%(prop:tarbuildnum)s' + '/' + '%(prop:buildername)s'+ ' && cp -r debs/ sha256sums.txt /packages/' + '%(prop:tarbuildnum)s' + '/' + '%(prop:buildername)s' + '/' + ' && sync /packages/' + '%(prop:tarbuildnum)s'), doStepIf=lambda step: hasFiles(step) and savePackage(step))) +f_deb_autobake.addStep(steps.ShellCommand(name='save_packages', timeout=7200, haltOnFailure=True, + command=util.Interpolate(""" + source /etc/os-release + mkdir -p /packages/%(prop:tarbuildnum)s/%(prop:buildername)s && + cp -r debs/ sha256sums.txt /packages/%(prop:tarbuildnum)s/%(prop:buildername)s/ && + cat << EOF > /packages/%(prop:tarbuildnum)s/%(prop:buildername)s/mariadb.sources && +X-Repolib-Name: MariaDB +Types: deb +URIs: https://ci.mariadb.org/%(prop:tarbuildnum)s/%(prop:buildername)s/ +Suites: $VERSION_CODENAME +Components: main main/debug +Trusted: yes +EOF +ln -sf %(prop:tarbuildnum)s/%(prop:buildername)s/mariadb.sources %(prop:branch)s-latest-%(prop:buildername)s.sources && +sync /packages/%(prop:tarbuildnum)s + """), doStepIf=lambda step: hasFiles(step) and savePackage(step))) f_deb_autobake.addStep(steps.Trigger(name='dockerlibrary', schedulerNames=['s_dockerlibrary'], waitForFinish=False, updateSourceStamp=False, set_properties={"tarbuildnum" : Property("tarbuildnum"), "mariadb_version" : Property("mariadb_version"), "master_branch" : Property("master_branch"), "parentbuildername": Property("buildername")}, doStepIf=lambda step: hasDockerLibrary(step))) f_deb_autobake.addStep(steps.Trigger(name='install', schedulerNames=['s_install'], waitForFinish=False, updateSourceStamp=False,