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

Handle longer dev.eessi.io prefix in ingestion #203

Merged
merged 7 commits into from
Dec 2, 2024

Conversation

Neves-P
Copy link
Member

@Neves-P Neves-P commented Dec 1, 2024

This PR addresses an issue when ingesting a tarball with an installation in a non-standard prefix coming from dev.eessi.io. This currently fails as spotted by @bedroge when merging https://github.com/EESSI/staging/pull/2176.

Stderr:

/opt/eessi/filesystem-layer/scripts/ingest-tarball.sh: line 273: ingest_example_tarball: command not found

The call to ingest_${tar_contents_type_dir}_tarball() should only point to ingest_init_tarball(), ingest_scritps_tarball(), ingest_compat_tarball() or ingest_software_tarball(). This fails, because when ingesting in dev.eessi.io ${tar_contents_type_dir} will instead be $EESSI_DEV_PROJECT (as currently defined here, to be changed to something not hard-coded soon.) Here I add a condition to look for the type of tarball to be ingested differently in dev.eessi.io builds.

@bedroge
Copy link
Collaborator

bedroge commented Dec 2, 2024

I've tested it on the tarball from EESSI/dev.eessi.io-example#7 / https://github.com/EESSI/staging/pull/2175, but now the problem shifts to the next parameter:

ERROR: the architecture directory in the tarball is linux, which is not a valid architecture!

@Neves-P
Copy link
Member Author

Neves-P commented Dec 2, 2024

Ah dang and I merged the staging pr...
Let me try to fix this quickly

@Neves-P Neves-P requested a review from bedroge December 2, 2024 08:41
Copy link
Collaborator

@bedroge bedroge left a comment

Choose a reason for hiding this comment

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

Tested this on the tarballs from EESSI/dev.eessi.io-example#7, and works like a charm. Thanks @Neves-P!

@bedroge bedroge merged commit b72e65a into EESSI:main Dec 2, 2024
21 checks 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.

2 participants