Skip to content

Commit 6addc86

Browse files
authored
Merge pull request ceph#62274 from phlogistonjohn/jjm-more-bwc-fixes
build-with-container: two small fixes
2 parents 743c9d1 + b4e11f7 commit 6addc86

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/script/build-with-container.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ def bc_run_tests(ctx):
572572
[
573573
"bash",
574574
"-c",
575-
f"cd {ctx.cli.homedir} && source ./run-make-check.sh && build && run",
575+
f"cd {ctx.cli.homedir} && source ./run-make-check.sh && build tests && run",
576576
],
577577
)
578578
with ctx.user_command():

src/script/buildcontainer-setup.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ fi
2828
# packages etc.
2929
case "${CEPH_BASE_BRANCH}~${DISTRO_KIND}" in
3030
*~*centos*8)
31-
dnf install -y java-1.8.0-openjdk-headless /usr/bin/rpmbuild wget
31+
dnf install -y java-1.8.0-openjdk-headless /usr/bin/rpmbuild wget curl
3232
install_container_deps
3333
dnf_clean
3434
;;
3535
*~*centos*9|*~*centos*10*|*~fedora*)
36-
dnf install -y /usr/bin/rpmbuild wget
36+
dnf install -y /usr/bin/rpmbuild wget curl
3737
install_container_deps
3838
dnf_clean
3939
;;
4040
*~*ubuntu*)
4141
apt-get update
42-
apt-get install -y wget reprepro
42+
apt-get install -y wget reprepro curl
4343
install_container_deps
4444
;;
4545
*)

0 commit comments

Comments
 (0)