Fix the localdb tests for ARM architecture macOS #4535
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
inodb
reviewed
Mar 3, 2023
scripts/e2e.sh
Outdated
Comment on lines
58
to
67
| if [[ "$(uname -s)" == "Darwin" ]] && [[ "$(sysctl -n machdep.cpu.brand_string)" =~ M.* ]]; then | ||
| # if macOS and M-series chip, use images for ARM architecture | ||
| export DOCKER_IMAGE_MYSQL=biarms/mysql:5.7 | ||
| export DOCKER_IMAGE_KEYCLOAK=alemairebe/keycloak:11.0.3 | ||
| export DOCKER_IMAGE_SESSION_SERVICE=fuzhaoyuan/session-service:0.5.0 | ||
| else | ||
| # else use images for x86_64 architecture | ||
| export DOCKER_IMAGE_MYSQL=mysql:5.7 | ||
| export DOCKER_IMAGE_KEYCLOAK=jboss/keycloak:11.0.3 | ||
| fi |
There was a problem hiding this comment.
this feels kinda similar to: https://github.com/cBioPortal/cbioportal-docker-compose/blob/master/init.sh#L7-L11. Wondering if we can just run init.sh in e2e tests as well?
Ok for now tho
There was a problem hiding this comment.
Yes of course! I checked the init.sh file but there're some notes I considered:
- The first part of
init.shfile seems running itself at each sub folder and it not seen ate2e.sh. I'm not sure if it will interfere with the following execution (I do assume not). - If run from
yarncommand vianode, since the current version of node we use (v15) only run through Rosetta translation, the$(arch)command will actually returni386. Therefore I used system check and chip check together to decide the platform. - The
keycloakpart is not insideinit.shso it needs to be specified ine2e.shhere anyway. So I just add others together.
But that is indeed an option. Let me know if that is a more appropriate way to do this.
There was a problem hiding this comment.
I tried to go with this approach but it is doing something different because we called init.sh within each sub folder, and the override yaml file doesn't seem to work in this case.
inodb
approved these changes
Mar 3, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix cBioPortal/cbioportal#10059
Fix the localdb tests for ARM architecture macOS