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 1998587: Automatically update app.openshift.io/vcs-* annotations #9912

Merged
merged 1 commit into from Aug 31, 2021

Conversation

jerolimov
Copy link
Member

Fixes:
https://issues.redhat.com/browse/ODC-6299
https://bugzilla.redhat.com/show_bug.cgi?id=1998587

Analysis / Root cause:
BuildConfig form updates only the spec data. Annotations are completely ignored until now.

Solution Description:
Update the app.openshift.io/vcs-uri and app.openshift.io/vcs-ref annotations when the user inserts a git source.

Screen shots / Gifs for design review:
https://user-images.githubusercontent.com/139310/131162920-c47e4b76-b75d-40c9-9613-9314d6ab91ed.mp4

Unit test coverage report:
Add 3 new tests:

 PASS  packages/dev-console/src/components/buildconfig/form-utils/__tests__/convert-to-buildconfig.spec.ts (8.615s)
  convertFormDataToBuildConfig
...
      ✓ updates the app.openshift.io/vcs-* annotations when the git parameters are changed
      ✓ removes the app.openshift.io/vcs-ref annotation when the git branch is not defined
      ✓ sets the app.openshift.io/vcs-ref annotation when the git ref is newly set
...

Test setup:

  1. Open Edit BuildConfig form.
  2. Update git url.
  3. Open yaml editor.

Browser conformance:

  • Chrome
  • Firefox
  • Safari
  • Edge

@openshift-ci openshift-ci bot added bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Aug 27, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 27, 2021

@jerolimov: This pull request references Bugzilla bug 1998587, which is invalid:

  • expected the bug to target the "4.9.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1998587: Automatically update app.openshift.io/vcs-* annotations

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.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 27, 2021
@jerolimov
Copy link
Member Author

/cc @divyanshiGupta
/kind bug
/bugzilla refresh

@openshift-ci openshift-ci bot added kind/bug Categorizes issue or PR as related to a bug. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Aug 27, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 27, 2021

@jerolimov: This pull request references Bugzilla bug 1998587, 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.9.0) matches configured target release for branch (4.9.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (gamore@redhat.com), skipping review request.

In response to this:

/cc @divyanshiGupta
/kind bug
/bugzilla refresh

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.

@jerolimov
Copy link
Member Author

/retest

Comment on lines +28 to +35
git: git.ref
? {
uri: git.url,
ref: git.ref,
}
: {
uri: git.url,
},
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
git: git.ref
? {
uri: git.url,
ref: git.ref,
}
: {
uri: git.url,
},
git: {
uri: git.url,
...(git.ref ? {ref: git.ref} : {}),
}

Copy link
Contributor

Choose a reason for hiding this comment

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

Since @jerolimov is on PTO we can improve this later as the logic seems to be fine.

@divyanshiGupta
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 31, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 31, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: divyanshiGupta, jerolimov

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-merge-robot openshift-merge-robot merged commit 11b6d12 into openshift:master Aug 31, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 31, 2021

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

Bugzilla bug 1998587 has been moved to the MODIFIED state.

In response to this:

Bug 1998587: Automatically update app.openshift.io/vcs-* annotations

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.9 milestone Sep 4, 2021
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-low Referenced Bugzilla bug's severity is low 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

4 participants