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

add historical repo paths to install cmd for old versions of texlive #17893

Merged
merged 2 commits into from May 24, 2023

Conversation

hattom
Copy link
Contributor

@hattom hattom commented May 10, 2023

tl;dr: the default -repository location for the install script points to the default mirror, which raises an error for version_year != 2023

@hattom
Copy link
Contributor Author

hattom commented May 10, 2023

I also patched the source_urls to include a 2nd path, not sure if this is necessary/wise or not.

@boegel boegel added the bug fix label May 10, 2023
@boegel boegel added this to the 4.x milestone May 10, 2023
@@ -41,6 +45,7 @@ postinstallcmds = [
'echo "TEXMFSYSCONFIG %(installdir)s/texmf-config" >> %(installdir)s/texlive.profile && '
'echo "TEXMFSYSVAR %(installdir)s/texmf-var" >> %(installdir)s/texlive.profile && '
'%(builddir)s/install-tl-%(version)s/install-tl -profile %(installdir)s/texlive.profile'
' -repository ' + 'ftp://tug.org/historic/systems/texlive/%s/tlnet-final' % local_version_year
Copy link
Member

Choose a reason for hiding this comment

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

Is there an HTTPS mirror?

FTP is blocked on some systems (it is on ours)

Copy link
Member

Choose a reason for hiding this comment

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

Maybe rsync://tug.org/historic/ is a better option?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think there's an https version. I'll change and test tomorrow when I'm back in the office.

Copy link
Contributor Author

@hattom hattom May 10, 2023

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

"Maybe rsync://tug.org/historic/ is a better option?" @boegel can you please elaborate? I don't think I understand.

My current thinking is:

install-tl ||
install-tl -repository ftp:// ||
install-tl -repository https://

given how the https mirror is almost unusably slow.

I would then skip the first line when updating the already old versions.

Copy link
Member

Choose a reason for hiding this comment

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

@hattom Makes sense to me. That should lead to a working install even on systems where FTP is blocked.

Copy link
Member

Choose a reason for hiding this comment

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

Do use a local variable here you just plug in the URL to use:

local_install_tl = "%%(builddir)s/install-tl-%%(version)s/install-tl -profile %(installdir)s/texlive.profile %s"

postinstallcmds = [
    'echo "TEXDIR         %(installdir)s/" > %(installdir)s/texlive.profile && '
    'echo "TEXMFLOCAL     %(installdir)s/texmf-local" >> %(installdir)s/texlive.profile && '
    'echo "TEXMFSYSCONFIG %(installdir)s/texmf-config" >> %(installdir)s/texlive.profile && '
    'echo "TEXMFSYSVAR    %(installdir)s/texmf-var" >> %(installdir)s/texlive.profile ',
    # sensible comment to explain what the command below is about goes here
    ' || '.join([
        local_install_tl % '',
        local_install_tl % '-repository ftp://...',
        local_install_tl % '-repository https://...',
    ]),
]

The use of %% in local_install_tl is important...

@boegel boegel changed the title texlive: add historical repo paths to install cmd for old versions add historical repo paths to install cmd for old versions of texlive May 10, 2023
@boegel boegel modified the milestones: 4.x, next release (4.7.2) May 10, 2023
@boegel
Copy link
Member

boegel commented May 23, 2023

@boegelbot please test @ generoso

@boegelbot
Copy link
Collaborator

@boegel: Request for testing this PR well received on login1

PR test command 'EB_PR=17893 EB_ARGS= EB_CONTAINER= /opt/software/slurm/bin/sbatch --job-name test_PR_17893 --ntasks=4 ~/boegelbot/eb_from_pr_upload_generoso.sh' executed!

  • exit code: 0
  • output:
Submitted batch job 10851

Test results coming soon (I hope)...

- notification for comment with ID 1560021570 processed

Message to humans: this is just bookkeeping information for me,
it is of no use to you (unless you think I have a bug, which I don't).

@boegel
Copy link
Member

boegel commented May 24, 2023

The test on generoso actually worked, but the test report failed to reach the PR due to a mysterious 403 bug we haven't fixed yet (see easybuilders/easybuild-framework#3934).

I'll rerun the test with --sanity-check-only...

@boegel
Copy link
Member

boegel commented May 24, 2023

@boegelbot please test @ generoso
EB_ARGS="--sanity-check-only"

@boegelbot
Copy link
Collaborator

@boegel: Request for testing this PR well received on login1

PR test command 'EB_PR=17893 EB_ARGS="--sanity-check-only" EB_CONTAINER= /opt/software/slurm/bin/sbatch --job-name test_PR_17893 --ntasks=4 ~/boegelbot/eb_from_pr_upload_generoso.sh' executed!

  • exit code: 0
  • output:
Submitted batch job 10869

Test results coming soon (I hope)...

- notification for comment with ID 1561382332 processed

Message to humans: this is just bookkeeping information for me,
it is of no use to you (unless you think I have a bug, which I don't).

@boegelbot
Copy link
Collaborator

Test report by @boegelbot
SUCCESS
Build succeeded for 4 out of 4 (4 easyconfigs in total)
cns1 - Linux Rocky Linux 8.5, x86_64, Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz (haswell), Python 3.6.8
See https://gist.github.com/boegelbot/b1d205e84a07e9e2a6094a5cd15103fd for a full test report.

Copy link
Member

@boegel boegel left a comment

Choose a reason for hiding this comment

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

lgtm

@boegel
Copy link
Member

boegel commented May 24, 2023

Going in, thanks @hattom!

@boegel boegel merged commit 518b8e0 into easybuilders:develop May 24, 2023
10 checks passed
@hattom hattom deleted the texlive_update_pre_2023 branch May 25, 2023 08:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants