This repository contains the code used to build the Ubuntu-based Delphix Appliance, leveraging open-source tools such as Debian's live-build, Docker, Ansible, OpenZFS, and others.
Apache License 2.0
19
stars
41
forks
source link
DLPX-85650 cutover: Update UPSTREAM_BRANCH for pregitflow work in appliance-build #720
This change will not be merged until the base branch of all PRs across this repo
is changed from 6.0/stage to develop.
This repo contains a hardcoded value on each branch.
The next question you might have is how is this value updated when release leads merge
from 6.0/stage -> 6.0/release, 6.0/release -> 6.0/patch or 6.0/release -> 6.0/stage.
The git-merge-repos script contains logic to replace this during branching. See fix_appliance_build in http://reviews.delphix.com/r/57863/diff/8/#1. The release leads are allowed to push
changes without requiring a PR because our branch protections allow this.
This change will not be merged until the base branch of all PRs across this repo is changed from 6.0/stage to develop. This repo contains a hardcoded value on each branch. The next question you might have is how is this value updated when release leads merge from 6.0/stage -> 6.0/release, 6.0/release -> 6.0/patch or 6.0/release -> 6.0/stage. The git-merge-repos script contains logic to replace this during branching. See fix_appliance_build in http://reviews.delphix.com/r/57863/diff/8/#1. The release leads are allowed to push changes without requiring a PR because our branch protections allow this.Problem
Update the branch value for the `develop` branch.Solution
None.Testing Done