# NOTE: This is not supposed to be an executable script yet, just # an annotated list of things done. # The name associated with your commit NAME="Your Name" # Your username used in kerberos, ssh, email USERNAME="you" EMAIL="$USERNAME@example.com" KERB="$USERNAME@EXAMPLE.COM" # The rhos package you want to workon PACKAGE="openstack-ceilometer" # The branch of the distribution DIST_BRANCH="rhos-6.0-rhel-7" # The branch on the rhos remote RHOS_BRANCH="rhos-6.0-patches" # The git remote for upstream OPENSTACK_REMOTE="http://git.openstack.org/openstack/ceilometer.git" # The git remote for rhos patches RHOS_REMOTE="ssh:$USERNAME@code.engineering.redhat.com:22/ceilometer.git" # The commit to cherry pick (with luck cleanly) from UPSTREAM_SHA="2891d16" # from eoghan's history # Install the necessary git bits sudo yum install -y git git-review # Configure self for git git config --global user.name $NAME git config --global user.email $EMAIL # Add the rhpkg repo sudo curl -o /etc/yum.repos.d/rhpkg.repo http://download.devel.redhat.com/rel-eng/dist-git/fedora/rhpkg.repo # Install rhpkg and krb5-workstation sudo yum install -y rhpkg krb5-workstation # Initially kerberose kinit $KERB # Clone the package we want to work with and go there rhpkg clone $PACKAGE cd $PACKAGE # Initialize git review # NOTE(cdent): Is this step necessary, I thought modern git review did it for # you, need to test. git review -s sed -i -e '$ i [ -f .gitreview ] || exit 0' .git/hooks/commit-msg # Checkout the branch for the distribution we care about git checkout $DIST_BRANCH # Add remotes for upstream and rhos-patches git remote add -f --tags openstack $OPENSTACK_REMOTE git remote add -f rhos $RHOS_REMOTE # Checkout the rhos-patches branch that we are working on git checkout $RHOS_BRANCH # Cherry pick the commit from upstream. git cherry-pick -x $UPSTREAM_SHA # Add bz and upstream- gerrit references git commit --amend # submit for review git review