diff --git a/ci_build_images/debian.Dockerfile b/ci_build_images/debian.Dockerfile index 144fc875..b8ec363a 100644 --- a/ci_build_images/debian.Dockerfile +++ b/ci_build_images/debian.Dockerfile @@ -47,6 +47,7 @@ RUN . /etc/os-release; \ ccache \ check \ default-jdk\ + dpkg \ dumb-init \ gawk \ git \ diff --git a/master-galera/master.cfg b/master-galera/master.cfg index 62008c7d..c003d372 100644 --- a/master-galera/master.cfg +++ b/master-galera/master.cfg @@ -191,7 +191,7 @@ f_deb_build.addStep(steps.GitHub( submodules=True )) f_deb_build.addStep(steps.ShellCommand(name='build packages', command=["bash", "-xc", util.Interpolate("""set -e -./scripts/build.sh -p""")], workdir='build')) +./scripts/build.sh -p""")], workdir='build'), env={'DEBIAN': '1'}) 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:branch)s' + '/' + '%(prop:revision)s'), doStepIf=lambda step: savePackage(step, savedPackageBranches))) f_deb_build.addStep(steps.ShellCommand(name="cleanup", command="rm -r * .* 2> /dev/null || true", alwaysRun=True))