VCS Branching Strategy

Individual products import configuration content (Ansible plays, roles, and more) into a repository in the Version Control Service (VCS) through their installation process. Typically, this repository exists in the cray organization in VCS and its name has the format [product name]-config-management.

The import branch of the product is considered “pristine content” and is added to VCS in a read-only branch. This step is taken to ensure the future updates of the product’s configuration content can be based on a clean branch, and that upgrades can proceed without merging issues.

HPE Cray products import their content into a branch with a name that has the format cray/[product]/[product version].

The version is in SemVer format. Product installation and operational workflows will direct users to create branches from these pristine product branches to begin customizing their configuration from the default provided by the HPE Cray product.

The workflow of branching from pristine imported content and handling upgrades to that content is shown in the diagram below (see “Branch Workflow”). In this scenario, the configuration customizations are made in a customer/main branch, which can be any branch in the repository, such as master, main, integration, or others. As configuration changes are made and the system is configured as required, users can point to the commits (white circles) in their CFS configuration layers to test and run HPE Cray products on the system. Users may also point to the commits on pristine branches (blue circle) in CFS configuration layers if the default configuration is sufficient.

Branch Workflow

When a product upgrade occurs (cray/product/1.4.0 in the above diagram), the product installer will create a new branch and commit based off the previous pristine branch. If the previous customizations on the customer/main branch also need to be included with the new 1.4.0 content, the user should initiate a Git merge of the new pristine content into their branch (or possibly into a test branch based on customer/main). This process will be the same for subsequent updates of the product as well.

IMPORTANT: If the HPE Cray product has specific instructions for installing and upgrading configuration content, those should take precedence over this generic workflow.

The “Branch Workflow” diagram is an example workflow that can be used to manage new product content being introduced during upgrades. However, CFS and VCS do not require any specific branching strategy. Users are free to manage the branches as they see fit with the exception of the pristine branches imported by individual HPE Cray products. CFS configuration layers (see CFS Configurations) only require a Git commit ID, a Git repository clone URL, and the path to an Ansible playbook to run the configuration content in the repository.

Resolving VCS merge conflicts

If the update-vcs-config stage of IUF fails due to git merge conflicts, they must be resolved manually. To do so, follow these steps:

  1. (ncn-mw#) Get the VCS username and password for git operations.

    echo $(kubectl get secret -n services vcs-user-credentials \
    --template={{.data.vcs_username}} | base64 -d)
echo $(kubectl get secret -n services vcs-user-credentials \
    --template={{.data.vcs_password}} | base64 -d)

  2. (ncn-mw#) Clone the VCS repository. This example uses the COS repo, but this procedure can be applied for any VCS repo.

    git clone https://api-gw-service-nmn.local/vcs/cray/uss-config-management.git
cd uss-config-management

  3. (ncn-mw#) Get the name of the previous integration branch, new integration branch, and pristine branch (e.g. integration-2.4.109, integration-2.4.118, origin/cray/cos/2.5.132). Use git branch -r to list the available branches.

    git branch -r

  4. (ncn-mw#) Create the new integration branch from the previous integration branch and merge the pristine branch.

    git checkout <previous integration branch>
git branch <new integration branch>
git checkout <new integration branch>
git merge <pristine branch>

  5. (ncn-mw#) Resolve the merge conflicts.

  6. (ncn-mw#) Commit the merge and push the results:

    git add .
git commit
git push origin <new integration branch>

  7. (ncn-mw#) If the merge conflict occurred during an IUF run, re-run the IUF update-vcs-config stage.