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

Support package refactor #336

Merged

Conversation

Fiona-Waters
Copy link
Contributor

@Fiona-Waters Fiona-Waters commented Oct 13, 2023

Issue link

Closes #237

What changes have been made

The support package has been removed and moved to a separate repo here. Relevant imports have been updated.

Verification steps

Checks

  • I've made sure the tests are passing.
  • Testing Strategy
    • Unit tests
    • Manual tests
    • Testing is not required for this change

@ChristianZaccaria
Copy link
Contributor

lgtm ! I guess we would need to merge the PR on the common repo first, this way we can test the e2e on GitHub actions here on this pull request before merging this one right?

@Fiona-Waters
Copy link
Contributor Author

lgtm ! I guess we would need to merge the PR on the common repo first, this way we can test the e2e on GitHub actions here on this pull request before merging this one right?

Yes that's right. We also need to run go mod tidy in CFO once the other PR has been merged to update the dependencies in go.mod and go.sum.

@Fiona-Waters Fiona-Waters force-pushed the support-package-refactor branch 4 times, most recently from 13a11f4 to 85f44cc Compare October 18, 2023 12:06
@Fiona-Waters
Copy link
Contributor Author

/retest

Comment on lines -140 to -142
@echo " CodeFlareSDKVersion = \"$(CODEFLARE_SDK_VERSION)\"" >> $(DEFAULTS_TEST_FILE)
@echo " RayVersion = \"$(RAY_VERSION)\"" >> $(DEFAULTS_TEST_FILE)
@echo " RayImage = \"$(RAY_IMAGE)\"" >> $(DEFAULTS_TEST_FILE)
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you also remove CODEFLARE_SDK_VERSION, RAY_VERSION and RAY_IMAGE references?
AFAIK they are used here, CODEFLARE_SDK_VERSION is also set in

CODEFLARE_SDK_VERSION=$(cut -c2- <<< ${{ github.event.inputs.codeflare-sdk-version }})

Copy link
Contributor

Choose a reason for hiding this comment

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

That brings another point - should the codeflare-common repo be updated for every release (as it reference SDK version)?
IMHO SDK reference is just temporary, to be removed once project-codeflare/codeflare-sdk#292 is implemented.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks. I have removed those references.
Once that SDK PR is merged we can remove the references to its version in codeflare-common. I can create a follow on issue for this.
The issue is blocked at the moment so I it should probably be updated for any releases in the meantime?

Copy link
Contributor

Choose a reason for hiding this comment

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

Right

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Follow up issue: project-codeflare/codeflare-common#5
What do we need to do to ensure it is updated in the meantime?

Copy link
Contributor

Choose a reason for hiding this comment

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

I am thinking whether it has sense to compose the codeflare-common update into release workflow...
That would be ideal solution but quite a big work considering that it would be removed soon. I would say that the reference can be updated manually in meantime until the SDK tests are implemented.

Copy link
Contributor

Choose a reason for hiding this comment

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

Though the MCAD is still referenced in codeflare-common too...
So in the end it may have sense to integrate it in release workflow.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok. Do we need to create an issue or track this anywhere?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, issue will be needed.
I will create it.

Copy link
Contributor

Choose a reason for hiding this comment

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

@astefanutti
Copy link
Contributor

/lgtm

Makefile Outdated Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
Copy link
Contributor

@sutaakar sutaakar left a comment

Choose a reason for hiding this comment

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

/lgtm

@sutaakar
Copy link
Contributor

/approve

@openshift-ci
Copy link

openshift-ci bot commented Oct 24, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sutaakar

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot merged commit 1d5c85d into project-codeflare:main Oct 24, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Pull support and any common, reusable e2e files from CFO into its own repo
5 participants