Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

non tck ones not limited to use podman #5822

Merged
merged 1 commit into from
Dec 13, 2024
Merged

non tck ones not limited to use podman #5822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion external/build_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function build_image() {
echo "The test in the build_image() function is ${test}"
# Used for tagging the image
tags="adoptopenjdk-${test}-test:${version}-${package}-${os}-${vm}-${build}"
if [[ "$test" == *"criu"* || "$test" == *"tck"* ]]; then
if [[ "$test" == *"criu"* || "$test" == tck-* ]]; then
container_build="sudo podman build"
fi

Expand Down
2 changes: 1 addition & 1 deletion external/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ parseCommandLineArgs() {
docker_os=ubi
fi

if [[ "${test}" == *"criu"* || "${test}" == *"tck"* ]]; then
if [[ "${test}" == *"criu"* || "${test}" == tck-* ]]; then
container_run="sudo podman run"
container_login="sudo podman login"
container_inspect="sudo podman inspect"
Expand Down
Loading