Fix portable aot tests (#4894)

* Fix portable aot tests - Some pipelines have $DOCKER_REGISTRY_CREDENTIALS in jenkins-pipeline but not $BASE_DOCKER_REGISTRY_CREDENTIAL, in this case login is not needed. Signed-off-by: LongyuZhang <[email protected]> * Update external/external.sh Co-authored-by: Shelley Lambert <[email protected]> --------- Signed-off-by: LongyuZhang <[email protected]> Co-authored-by: Shelley Lambert <[email protected]>
adoptium · Dec 12, 2023 · 131f68a · 131f68a
1 parent 193a7a1
commit 131f68a
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/external/external.sh b/external/external.sh
@@ -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