Skip to content

Handle tarballs with dev.eessi.io project subdir in name #212

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

Merged
bedroge merged 6 commits into from
Apr 17, 2025
Merged

Handle tarballs with dev.eessi.io project subdir in name #212

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
943c442
Handle tarfiles with dev eessi project subdir in name
Neves-P Apr 15, 2025
badfbf8
Improve comment
Neves-P Apr 15, 2025
3c559af
Handle file depth and project subdir from tarball
Neves-P Apr 15, 2025
7482541
Actually have the correct order of project_subdir/versions
Neves-P Apr 15, 2025
5d1d210
Ensure correct basedir with project_name regardless of arch
Neves-P Apr 15, 2025
36e0bae
Add comment on tarball and project name
Neves-P Apr 17, 2025
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
10 changes: 7 additions & 3 deletions scripts/ingest-tarball.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,12 +258,16 @@ version=$(echo "${tar_file_basename}" | cut -d- -f2)
contents_type_dir=$(echo "${tar_file_basename}" | cut -d- -f3)
tar_first_file=$(tar tf "${tar_file}" | head -n 1)
tar_top_level_dir=$(echo "${tar_first_file}" | cut -d/ -f1)
# Handle longer prefix with project name in dev.eessi.io
# Handle longer prefix with project name in dev.eessi.io and
# get the right basedir from the tarball name
if [ "${cvmfs_repo}" = "dev.eessi.io" ]; then
tar_contents_start_level=3
project_name=$(echo "${tar_file_basename}" | rev | cut -d- -f2 | rev)
Comment thread
Neves-P marked this conversation as resolved.
basedir="${project_name}"/versions
else
tar_contents_start_level=2
basedir=versions
fi

tar_contents_start_level=2
tar_contents_type_dir=$(tar tf "${tar_file}" | head -n 2 | tail -n 1 | cut -d/ -f${tar_contents_start_level})

# Check if we are running as the CVMFS repo owner, otherwise run cvmfs_server with sudo
Expand Down
Loading