Story (Required)

When implementing crd feature, the crd branch was created to contain all code changes. When the crd feature implementation is ready, we need to merge crd branch with master branch, and all further development and release will be based on the merged master branch.

Background and Approach (Required)

N/A

Out of Scope

N/A

Dependencies

N/A

Acceptance Criteria (Mandatory)

• all conflicts between the 2 branches should be resolved
• all bug fixes and enhancements in the master branch should be preserved
• all tests should pass

Definition of Done

• Code Complete:
  • All code has been written, reviewed, and approved.
• Tested:
  • Unit tests have been written and passed.
  • Ensure code coverage is not reduced with the changes.
  • Integration tests have been automated.
  • System tests have been conducted, and all critical bugs have been fixed.
  • Tested and merged on OpenShift either upstream or downstream on a local build.
• Documentation:
  • User documentation or release notes have been written (if applicable).
• Build:
  • Code has been successfully built and integrated into the main repository / project.
  • Midstream changes (if applicable) are done, reviewed, approved and merged.
• Review:
  • Code has been peer-reviewed and meets coding standards.
  • All acceptance criteria defined in the user story have been met.
  • Tested by reviewer on OpenShift.
• Deployment:
  • The feature has been deployed on OpenShift cluster for testing.