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.

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

Fix portable aot tests #4894

Merged
merged 2 commits into from
Dec 12, 2023
Merged

Fix portable aot tests #4894

merged 2 commits into from
Dec 12, 2023

Conversation

LongyuZhang
Copy link
Contributor

@LongyuZhang LongyuZhang commented Nov 30, 2023

  • Some pipelines have $DOCKER_REGISTRY_CREDENTIALS in jenkins-pipeline but not $BASE_DOCKER_REGISTRY_CREDENTIAL, in this case login is not needed.
  • Related Issue: github_ibm/runtimes/backlog/issues/1262

- 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]>
@LongyuZhang
Copy link
Contributor Author

Test Links:

  • Adoptium grinder without either $BASE_DOCKER_REGISTRY_CREDENTIAL or $DOCKER_REGISTRY_CREDENTIALS: https://ci.adoptium.net/view/Test_grinder/job/Grinder/8115/
  • hyc grinder with both credentials: 36477
  • hyc grinder with only $DOCKER_REGISTRY_CREDENTIALS: 36478 (no login for aot tests without base credential, so reach limit)
  • hyc grinder with only $BASE_DOCKER_REGISTRY_CREDENTIAL: 36481

@LongyuZhang LongyuZhang marked this pull request as draft December 4, 2023 17:29
@LongyuZhang LongyuZhang marked this pull request as ready for review December 4, 2023 21:37
Copy link
Contributor

@llxia llxia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

# 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 criu-ubi image with criu binary is only available internally
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is a bit hard to read :-). Not quite sure what logic it is trying to convey.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this step, external tests get the initial base container image. Most tests uses BASE_DOCKER_REGISTRY_CREDENTIAL to get this base image from Dockerhub (this login will increase pull limit), but criu-ubi base image temporarily get its base image from hyc-dockerhub instead since we can only set up its dependent package internally with ubi subscription. Once we are able to publish this image on Dockerhub later, we will remove this logic then.

external/external.sh Outdated Show resolved Hide resolved
Co-authored-by: Shelley Lambert <[email protected]>
@llxia llxia merged commit 131f68a into adoptium:master Dec 12, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants