overview

This is part of the company wide effort to avoid problematic language.

See following links, including original blog post by Chris Wright from June 2020:

• Making open source more inclusive by eradicating problematic language
• Resources for avoiding problematic language
• Conscious Language in your Project: Best Practices and Recommendations

action plan

1. update references @ uhc-portal
2. trigger uhc-portal jenkins build for staging (so app-interface qontract-reconcile builds do not fail)
3. rename default-branch via GH web UI
4. update build & deployment configs @ app-interface

implementation

replacement of master branch-name

uhc-portal

breaking changes

• .github/workflows/ci.yml:

  8 | - 'master'
  

• .github/workflows/e2e.yml:

  8 | - 'master'
  

• .github/workflows/check_api_pipeline.yml:

  18 | BASE_BRANCH_NAME: \$\{\{ github.ref_name || 'master' \}\}
  

• package.json:

  224 | "test-changes": "yarn test --changedSince=master",
  

• .gitlab-ci.yml (this change effectively breaks GH/GL sync - but no one uses that anymore):

  31 | - git clone -b master [https://$GITHUB_TOKEN@github.com/RedHatInsights/uhc-portal] uhc-portal
  

non-breaking changes

• .github/pull_request_template.md:

  35 | Please review and follow the [PR process](https://github.com/RedHatInsights/uhc-portal/blob/master/docs/pull-request-process.md).
  

• docs/pull-request-process.md:

  48 | 1. :pencil2: Author pulls in changes from master if needed and waits for all checks/tests to pass
  

• docs/releasing.md:

  3 | 1. #### Pick the latest commit hash that can be released to Prod from master
  

• docs/releasing.md:

  5 | Go to [https://github.com/RedHatInsights/uhc-portal/commits/master/]
  

• docs/unit-testing.md:

  254 | These todo tests should be checked into git if there is a need to merge the code to master before the tests are done.
  

• .gitlab-ci.yml:

  25 | 📦 Sync master branch:
  

• README.md:

  68 | | `master` | [https://console.dev.redhat.com/openshift] | stable version | staging |
  69 | | `master` (specific revision) | [https://console.redhat.com/openshift] | stable version | production |
  

• build_deploy.sh:

  20 | # long-lived deployment branches (i.e. master).
  

app-interface

breaking changes

• data/services/ocm/ui/cicd/deploy.yml:

  41 | ref: master
  45 | name: RedHatInsights-uhc-portal-gh-build-master
  

• data/services/ocm/ui/cicd/ci-int/jobs.yaml:

  36 | default_branch: master
  40 | default_branch: master
  44 | default_branch: master
  

non-breaking changes

• data/services/ocm/ui/cicd/ci-int/jobs.yaml:

  29 | display_name: OCM UI check pull request on master
  33 | display_name: OCM UI build master
  

additions or other changes

app-interface

breaking changes

the base-templates gh_build_master, gh_pr_check and gh_timed are used by any of our job-templates which fetches trunk; they both in turn reference the gh_checkout base-template, which hard-codes master as default value for the checkout-branch.

as a result, any job-templates which point at uhc-portal master - i.e. which use any of those base-templates (including product build, test runners, test image builders etc.) would now have to either update their branch values or explicitly state main as branch instead of relying on the base-template implicit default.

specifically:

these will be updated so jobs state 'main' instead of 'master':

• ocm-ui-qe-gh-cypress-smoke
• ocm-ui-qe-gh-cypress-sanity
• ocm-ui-qe-gh-cypress-image-build

this will be updated so the job-template declares branch: 'main':

• ocm-ui-gh-build-master
• ocm-ui-gh-pr-check

notes

• references to GitLab master have been omitted from the action-items, as the rename is only done in the GitHub repo
• as a sidenote - besides the trunk name, uhc-portal is littered with the term master in source and test files, as direct result of API terminology. master is used in the context of node-types, subnet-types, etc.