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

Query UCX-Py from gpuCI versioning service #818

Merged
merged 4 commits into from
Jan 14, 2022

Conversation

pentschev
Copy link
Member

No description provided.

@pentschev pentschev requested a review from a team as a code owner December 8, 2021 15:15
@github-actions github-actions bot added the gpuCI gpuCI issue label Dec 8, 2021
@pentschev pentschev added 3 - Ready for Review Ready for review by team improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Dec 8, 2021
Copy link
Member

@ajschmidt8 ajschmidt8 left a comment

Choose a reason for hiding this comment

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

As discussed in our Slack thread, we should move the curl call to the script below (which gets run every time a new release branch is created) in order to minimize the number of network requests in CI. Similarly to cudf (link), we can then use some sed commands to find and replace any hardcoded values that need to be updated in the repo.

https://github.com/rapidsai/dask-cuda/blob/branch-22.02/ci/release/update-version.sh

@pentschev
Copy link
Member Author

@ajschmidt8 I updated scripts to reflect the change you suggested, could you take a look to ensure I did everything correctly?

@@ -17,11 +17,13 @@ CURRENT_MAJOR=$(echo $CURRENT_TAG | awk '{split($0, a, "."); print a[1]}')
CURRENT_MINOR=$(echo $CURRENT_TAG | awk '{split($0, a, "."); print a[2]}')
CURRENT_PATCH=$(echo $CURRENT_TAG | awk '{split($0, a, "."); print a[3]}')
CURRENT_SHORT_TAG=${CURRENT_MAJOR}.${CURRENT_MINOR}
CURRENT_UCXPY_VERSION=$(curl -s https://version.gpuci.io/rapids/${CURRENT_SHORT_TAG}`.*)
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this needed?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not currently, I had it for completeness but I removed now since it's unused at this time.


#Get <major>.<minor> for next version
NEXT_MAJOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[1]}')
NEXT_MINOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[2]}')
NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR}
NEXT_UCXPY_VERSION=$(curl -s https://version.gpuci.io/rapids/${NEXT_SHORT_TAG}`.*)
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this should be NEXT_UCXPY_VERSION="$(curl -s https://version.gpuci.io/rapids/${NEXT_SHORT_TAG}).*"

Copy link
Member Author

Choose a reason for hiding this comment

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

Agreed, I now see there were two typos, your suggestion should fix both. Thanks @Ethyling !

# Update UCX-Py version
sed_runner 's/export UCXPY_VERSION=.*/export UCXPY_VERSION='${NEXT_UCXPY_VERSION}'/g' ci/gpu/build.sh
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should use " instead of ' to expand the variable

Copy link
Member Author

Choose a reason for hiding this comment

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

@ajschmidt8
Copy link
Member

I updated scripts to reflect the change you suggested, could you take a look to ensure I did everything correctly?

Sorry, late to reply here. Looks like Jordan's got you covered!

@pentschev
Copy link
Member Author

Sorry for the late reply here as well, I think all suggestions are now addressed. Would you mind taking another look when you have the chance @Ethyling @ajschmidt8 ?

@pentschev
Copy link
Member Author

rerun tests

1 similar comment
@pentschev
Copy link
Member Author

rerun tests

@pentschev
Copy link
Member Author

Forgot to merge this, thanks @ajschmidt8 and @Ethyling for reviews!

@pentschev
Copy link
Member Author

@gpucibot merge

@rapids-bot rapids-bot bot merged commit 5084147 into rapidsai:branch-22.02 Jan 14, 2022
@pentschev pentschev deleted the update-ucx-py-gpuci branch January 14, 2022 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3 - Ready for Review Ready for review by team gpuCI gpuCI issue improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants