Skip to content

Update the images #2

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

Jump to bottom
Merged
merged 4 commits into from
Jan 29, 2025
Merged

Update the images #2

merged 4 commits into from
Jan 29, 2025

Conversation

SamuelLarkin
Copy link
Contributor

@SamuelLarkin SamuelLarkin commented Jan 28, 2025 •
edited
Loading

This PR was triggered after getting the following Warnings on GPSC

*** System messages:
*** WARNING: Image 'nrc/nrc_all_default_centos-7-amd64_latest' not allowed for user/group/cluster, using 'registry.maze.science.gc.ca/ssc-hpcs/generic-job:ubuntu22.04' instead
*** WARNING: Allowed images:
*** WARNING:   registry.maze.science.gc.ca/ssc-hpcs/generic-job:ubuntu22.04
*** WARNING:   registry.maze.science.gc.ca/ssc-hpcs/generic-job:ubuntu24.04
*** WARNING:   registry.maze.science.gc.ca/ssc-hpcs/generic-job:ubuntu20.04
*** WARNING:   registry.maze.science.gc.ca/ssc-hpcs/generic-job:centos9

@joanise
Copy link
Member

joanise commented Jan 28, 2025

Let's update CI to test with Python 3.8+

@joanise
Copy link
Member

joanise commented Jan 28, 2025

Nice shell linting. I assume you've tested most of these changes?

@SamuelLarkin SamuelLarkin force-pushed the dev.sl/image branch 2 times, most recently from 1150561 to 1662448 Compare January 29, 2025 14:04
@SamuelLarkin SamuelLarkin changed the title [WIP] update the image Update the images Jan 29, 2025
joanise
joanise approved these changes Jan 29, 2025
View reviewed changes
Copy link
Member

@joanise joanise left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks for updating!

joanise
joanise reviewed Jan 29, 2025
View reviewed changes
bin/psub Outdated
expr "$1" + 0 &> /dev/null
RC=$?
if [ $RC != 0 -a $RC != 1 ] || [ $1 -le 0 ]; then
if [ $RC != 0 ] && [ $RC != 1 ] || [ "$1" -le 0 ]; then
Copy link
Member

Choose a reason for hiding this comment

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

Not a fan of this, since it means calling /usr/bin/test three times instead of once or twice.

I would prefer using [[ ... ]] and do the logic natively in bash instead, which is OK here since this is a #!/bin/bash script.

bin/psub Outdated
# call it with its interpreter
if [ -f "$PROG_NAME" -a ! -x "$PROG_NAME" -a ! "$FORCE" ]; then
if LC_ALL=C file $PROG_NAME | grep -q "script text"; then
if [ -f "$PROG_NAME" ] && [ ! -x "$PROG_NAME" ] && [ ! "$FORCE" ]; then
Copy link
Member

Choose a reason for hiding this comment

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

ditto

@SamuelLarkin SamuelLarkin merged commit a8426fb into main Jan 29, 2025
5 checks passed
@joanise joanise deleted the dev.sl/image branch January 29, 2025 22:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@joanise joanise joanise approved these changes

@marctessier marctessier Awaiting requested review from marctessier

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@SamuelLarkin @joanise