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

Jump to bottom

Fix portable aot tests #4894

Merged
merged 2 commits into from
Dec 12, 2023
Merged

Fix portable aot tests #4894

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b16745
Fix portable aot tests
LongyuZhang Nov 30, 2023
e4e0d97
Update external/external.sh
LongyuZhang Dec 12, 2023
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
15 changes: 8 additions & 7 deletions external/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,14 +285,15 @@ parseCommandLineArgs "$@"
if [ $command_type == "prepare" ]; then
# Specify docker.io or internal registry to prepare base image with login to increase pull limit or authenticate; Redhat Registry no login.
if [[ $base_docker_registry_url != "default" ]]; then
# Container credential check. Temporarily criu-ubi image with criu binary is only available internally
if [[ ! -z $BASE_DOCKER_REGISTRY_CREDENTIAL_USR || ! -z $DOCKER_REGISTRY_CREDENTIALS_USR ]]; then
# Container credential check.
# Temporarily host criu-ubi image with criu binary on internal/private hub. In that case, provide USR/PSW for access
if [[ "${test}" == *"criu-ubi"* && ! -z $DOCKER_REGISTRY_CREDENTIALS_USR ]]; then
BASE_DOCKER_REGISTRY_CREDENTIAL_USR=$DOCKER_REGISTRY_CREDENTIALS_USR
BASE_DOCKER_REGISTRY_CREDENTIAL_PSW=$DOCKER_REGISTRY_CREDENTIALS_PSW
fi
if [[ ! -z $BASE_DOCKER_REGISTRY_CREDENTIAL_USR ]]; then
echo "Base Docker Registry login starts to obtain Base Docker Image:"
if [[ "${test}" != *"criu-ubi"* ]]; then
echo $BASE_DOCKER_REGISTRY_CREDENTIAL_PSW | $container_login --username=$BASE_DOCKER_REGISTRY_CREDENTIAL_USR --password-stdin $base_docker_registry_url
else
echo $DOCKER_REGISTRY_CREDENTIALS_PSW | $container_login --username=$DOCKER_REGISTRY_CREDENTIALS_USR --password-stdin $base_docker_registry_url
fi
echo $BASE_DOCKER_REGISTRY_CREDENTIAL_PSW | $container_login --username=$BASE_DOCKER_REGISTRY_CREDENTIAL_USR --password-stdin $base_docker_registry_url
else
echo "No credential available for container registry, will proceed without login..."
fi
Expand Down