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

Bug 1877351: Add fallback to builder image detection #6570

Merged

Conversation

karthikjeeyar
Copy link
Contributor

Fixes: https://issues.redhat.com/browse/ODC-4205

Problem:
If there are multiple builder image recommendations, then builder detection should pick the releavant builder image based on the list of supported builderImages.

Solution:
Builder image detection needs to match with the first supported builder images in the console.

Screenshots:
builder-image-issue

To Test:

  1. go to +Add -> From git
  2. enter git repo url https://github.com/nodeshift-starters/react-web-app

Builder image detection should select nodeJs since modern-web-app is no longer supported by openshift imagestreams.

@openshift-ci-robot openshift-ci-robot added the component/dev-console Related to dev-console label Sep 9, 2020
@karthikjeeyar karthikjeeyar changed the title Add fallback to builder image detection Bug 1877351: Add fallback to builder image detection Sep 9, 2020
@openshift-ci-robot openshift-ci-robot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Sep 9, 2020
@openshift-ci-robot
Copy link
Contributor

@karthikjeeyar: This pull request references Bugzilla bug 1877351, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1877351: Add fallback to builder image detection

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@karthikjeeyar
Copy link
Contributor Author

/kind bug
/assign @rohitkrai03

@openshift-ci-robot openshift-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Sep 9, 2020
@invincibleJai
Copy link
Member

/retest

@divyanshiGupta
Copy link
Contributor

@karthikjeeyar you need to add <GitSection builderImages={builderImages}/> to EditApplicationForm as well.

@divyanshiGupta
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 9, 2020
@invincibleJai
Copy link
Member

/assign

@invincibleJai
Copy link
Member

/approve

Verified the changes , works as expected.

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: divyanshiGupta, invincibleJai, karthikjeeyar

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 10, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 80fe95c into openshift:master Sep 10, 2020
@openshift-ci-robot
Copy link
Contributor

@karthikjeeyar: All pull requests linked via external trackers have merged:

Bugzilla bug 1877351 has been moved to the MODIFIED state.

In response to this:

Bug 1877351: Add fallback to builder image detection

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@spadgett spadgett added this to the v4.6 milestone Sep 11, 2020
@karthikjeeyar
Copy link
Contributor Author

/cherrypick release-4.5

@openshift-cherrypick-robot

@karthikjeeyar: #6570 failed to apply on top of branch "release-4.5":

Applying: Add fallback to builder image detection
Using index info to reconstruct a base tree...
M	frontend/packages/dev-console/src/components/edit-application/EditApplicationForm.tsx
M	frontend/packages/dev-console/src/components/import/git/GitSection.tsx
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/dev-console/src/components/import/git/GitSection.tsx
CONFLICT (content): Merge conflict in frontend/packages/dev-console/src/components/import/git/GitSection.tsx
Auto-merging frontend/packages/dev-console/src/components/edit-application/EditApplicationForm.tsx
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add fallback to builder image detection
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-4.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/dev-console Related to dev-console kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants