Skip to content

Making the bootstrap script work offline #1880

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

Closed
ocaisa wants to merge 5 commits into from
Closed

Making the bootstrap script work offline #1880

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e9755a
Making the bootstrap script work offline
Aug 18, 2016
79ea9f9
Only make the switch if the source exists
Aug 19, 2016
69919f6
Need to make sure sourcepath exists first
Aug 19, 2016
d2734f3
Style update
Aug 19, 2016
b751fc4
Merge branch 'develop' into patch-3
Sep 23, 2016
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
11 changes: 9 additions & 2 deletions easybuild/scripts/bootstrap_eb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,15 @@ def stage0(tmpdir):
# We download a custom version of distribute: it uses a newer version of markerlib to avoid a bug (#1099)
# It's is the source of distribute 0.6.49 with the file _markerlib/markers.py replaced by the 0.6 version of
# markerlib which can be found at https://pypi.python.org/pypi/markerlib/0.6.0
sys.argv.append('--download-base=http://hpcugent.github.io/easybuild/files/')
distribute_setup_main(version="0.6.49-patched1")
distribute_version = "0.6.49-patched1"
if EASYBUILD_BOOTSTRAP_SOURCEPATH is not None and \
os.path.exists(os.path.abspath(EASYBUILD_BOOTSTRAP_SOURCEPATH) + '/' + 'distribute-' + distribute_version + '.tar.gz'):
# Assume we're offline and the file should be available
debug("Looking for distribute tarball in EASYBUILD_BOOTSTRAP_SOURCEPATH")
sys.argv.append('--download-base=file://' + os.path.abspath(EASYBUILD_BOOTSTRAP_SOURCEPATH) + '/')
Copy link
Member

@boegel boegel Aug 19, 2016

Choose a reason for hiding this comment

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

@ocaisa currently, not all tarballs must be provided in $EASYBUILD_BOOTSTRAP_SOURCEPATH, but here you're requiring that they are

How about making this conditional on having the expected tarball there?

Copy link
Member Author

@ocaisa ocaisa Aug 19, 2016

Choose a reason for hiding this comment

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

I thought about that but then I said if you were aiming for an offline install then there's no difference, if the file is not there it will fail to get it anyway

Copy link
Member

@boegel boegel Aug 19, 2016

Choose a reason for hiding this comment

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

the$EASYBUILD_BOOTSTRAP_SOURCEPATH option is not intended exclusively for offline installation, but also for testing the bootstrap mechanism under certain conditions (e.g. with a develop tarball for framework, or with an updated easyblock for EasyBuild itself, etc.)...

else:
sys.argv.append('--download-base=http://hpcugent.github.io/easybuild/files/')
distribute_setup_main(version=distribute_version)
sys.argv = orig_sys_argv

# sanity check
Expand Down