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

'UPSTREAM: <carry>' should be the convention followed for commits for carrying patches #15

Closed
wants to merge 1 commit into from

Conversation

amadhusu
Copy link

@amadhusu amadhusu commented Feb 7, 2024

Description of your changes:
Resolves RHOAIENG-1695

Checklist:

Copy link

openshift-ci bot commented Feb 7, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: amadhusu
Once this PR has been reviewed and has the lgtm label, please assign humairak for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@dsp-developers
Copy link

A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-15
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-15
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-15
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-15
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-15
MLMD Server: quay.io/opendatahub/ds-pipelines-metadata-grpc:pr-15
MLMD Envoy Proxy: quay.io/opendatahub/ds-pipelines-metadata-envoy:pr-15
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-15

@dsp-developers
Copy link

An OCP cluster where you are logged in as cluster admin is required.

The Data Science Pipelines team recommends testing this using the Data Science Pipelines Operator. Check here for more information on using the DSPO.

To use and deploy a DSP stack with these images (assuming the DSPO is deployed), first save the following YAML to a file named dspa.pr-15.yaml:

apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
kind: DataSciencePipelinesApplication
metadata:
  name: pr-15
spec:
  dspVersion: v2
  apiServer:
    image: "quay.io/opendatahub/ds-pipelines-api-server:pr-15"
    argoDriverImage: "quay.io/opendatahub/ds-pipelines-driver:pr-15"
    argoLauncherImage: "quay.io/opendatahub/ds-pipelines-launcher:pr-15"
  persistenceAgent:
    image: "quay.io/opendatahub/ds-pipelines-persistenceagent:pr-15"
  scheduledWorkflow:
    image: "quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-15"
  mlmd:  
    deploy: true  # Optional component
    grpc:
      image: "quay.io/opendatahub/ds-pipelines-metadata-grpc:pr-15"
    envoy:
      image: "quay.io/opendatahub/ds-pipelines-metadata-envoy:pr-15"
  mlpipelineUI:
    deploy: true  # Optional component 
    image: "quay.io/opendatahub/ds-pipelines-frontend:pr-15"
  objectStorage:
    minio:
      deploy: true
      image: 'quay.io/opendatahub/minio:RELEASE.2019-08-14T20-37-41Z-license-compliance'

Then run the following:

cd $(mktemp -d)
git clone [email protected]:opendatahub-io/data-science-pipelines.git
cd data-science-pipelines/
git fetch origin pull/15/head
git checkout -b pullrequest b6b2ffe14b7f2e33cdefab701ed80731b32b4295
oc apply -f dspa.pr-15.yaml

More instructions here on how to deploy and test a Data Science Pipelines Application.

Copy link
Member

@DharmitD DharmitD left a comment

Choose a reason for hiding this comment

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

/lgtm

@HumairAK
Copy link

HumairAK commented Feb 7, 2024

/hold

I'd like to avoid having to add carried patches to readme as it introduces unnecessary conflicts.
@amadhusu did you look into openshift-ci and whether we can utilize it to enforce this pattern via ci?

@amadhusu
Copy link
Author

amadhusu commented Feb 7, 2024

Closing out this Pull Request as we are going to setup a Github Workflow to run the commitchecker against each PR to validate this .

@amadhusu amadhusu closed this Feb 7, 2024
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.

4 participants