bb.org: Fix galera upload step

MariaDB · Jan 5, 2022 · 83a5a0e · 83a5a0e
1 parent f2cc1be
commit 83a5a0e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/buildbot.mariadb.org/master-galera/master.cfg b/buildbot.mariadb.org/master-galera/master.cfg
@@ -326,7 +326,7 @@ f_deb_build.addStep(steps.GitHub(
 f_deb_build.addStep(steps.ShellCommand(name='build packages', command=["bash", "-xc", util.Interpolate("""set -e
 ./scripts/build.sh -p""")], workdir='build'))
 f_deb_build.addStep(dpkgDeb())
-f_deb_build.addStep(steps.ShellCommand(name='save_packages', timeout=7200, haltOnFailure=True, command=util.Interpolate('mkdir -p ' + '/packages/' + '%(prop:branch)s' + '/' + '%(prop:revision)s' + '/' + '%(prop:buildername)s'+ ' && cp -r debs/ sha256sums.txt /packages/' + '%(prop:branch)s' + '/' + '%(prop:revision)s' + '/' + '%(prop:buildername)s' + '/' +  ' && sync /packages/' + '%(prop:tarbuildnum)s'), doStepIf=lambda step: savePackage(step)))
+f_deb_build.addStep(steps.ShellCommand(name='save_packages', timeout=7200, haltOnFailure=True, command=util.Interpolate('mkdir -p ' + '/packages/' + '%(prop:branch)s' + '/' + '%(prop:revision)s' + '/' + '%(prop:buildername)s'+ ' && cp -r debs/ sha256sums.txt /packages/' + '%(prop:branch)s' + '/' + '%(prop:revision)s' + '/' + '%(prop:buildername)s' + '/' +  ' && sync /packages/' + '%(prop:branch)s' + '/' + '%(prop:revision)s'), doStepIf=lambda step: savePackage(step)))
 f_deb_build.addStep(steps.ShellCommand(name="cleanup", command="rm -r * .* 2> /dev/null || true", alwaysRun=True))
 
 ## f_rpm_build - create source tarball
@@ -341,7 +341,7 @@ f_rpm_build.addStep(steps.GitHub(
 ))
 f_rpm_build.addStep(steps.ShellCommand(name='build packages', command=["bash", "-xc", "./scripts/build.sh -p"], workdir='build'))
 f_rpm_build.addStep(rpmSave())
-f_rpm_build.addStep(steps.ShellCommand(name='save_packages', timeout=7200, haltOnFailure=True, command=util.Interpolate('mkdir -p ' + '/packages/' + '%(prop:branch)s' + '/' + '%(prop:revision)s' + '/' + '%(prop:buildername)s'+ ' && cp -r rpms srpms sha256sums.txt' + ' /packages/' + '%(prop:branch)s' + '/' + '%(prop:revision)s' + '/' + '%(prop:buildername)s' + '/' +  ' && sync /packages/' + '%(prop:revision)s'), doStepIf=lambda step: savePackage(step)))
+f_rpm_build.addStep(steps.ShellCommand(name='save_packages', timeout=7200, haltOnFailure=True, command=util.Interpolate('mkdir -p ' + '/packages/' + '%(prop:branch)s' + '/' + '%(prop:revision)s' + '/' + '%(prop:buildername)s'+ ' && cp -r rpms srpms sha256sums.txt' + ' /packages/' + '%(prop:branch)s' + '/' + '%(prop:revision)s' + '/' + '%(prop:buildername)s' + '/' +  ' && sync /packages/' + '%(prop:branch)s' + '/' + '%(prop:revision)s'), doStepIf=lambda step: savePackage(step)))
 f_rpm_build.addStep(steps.ShellCommand(name="cleanup", command="rm -r * .* 2> /dev/null || true", alwaysRun=True))
 
 ####### LOCKS