alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '7c126df0621240e6c80a4508ef8b2667824566a7' into prow-update-master

Browse Source
This commit is contained in:
Patrick Ohly
2021-02-03 22:13:32 +01:00
parent 165f6e09a1 7c126df062
commit 096ef494a0
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
release-tools/README.md
View File

@@ -44,10 +44,17 @@ is the recommended way of maintaining a copy of the rules inside the
changes also locally, test them and then push them back to the shared changes also locally, test them and then push them back to the shared
repository at a later time. repository at a later time.
We no longer care about importing the full commit history, so `--squash` should be used
when submitting a `release-tools` update. Also make sure that the PR for that
contains the automatically generated commit message in the PR description.
It contains the list of individual commits that were squashed. The script from
https://github.com/kubernetes-csi/csi-release-tools/issues/7 can create such
PRs automatically.
Cheat sheet: Cheat sheet:
- `git subtree add --prefix=release-tools https://github.com/kubernetes-csi/csi-release-tools.git master` - add release tools to a repo which does not have them yet (only once) - `git subtree add --squash --prefix=release-tools https://github.com/kubernetes-csi/csi-release-tools.git master` - add release tools to a repo which does not have them yet (only once)
- `git subtree pull --prefix=release-tools https://github.com/kubernetes-csi/csi-release-tools.git master` - update local copy to latest upstream (whenever upstream changes) - `git subtree pull --squash --prefix=release-tools https://github.com/kubernetes-csi/csi-release-tools.git master` - update local copy to latest upstream (whenever upstream changes)
- edit, `git commit`, `git subtree push --prefix=release-tools git@github.com:<user>/csi-release-tools.git <my-new-or-existing-branch>` - push to a new branch before submitting a PR - edit, `git commit`, `git subtree push --prefix=release-tools git@github.com:<user>/csi-release-tools.git <my-new-or-existing-branch>` - push to a new branch before submitting a PR
verify-shellcheck.sh verify-shellcheck.sh

8
release-tools/boilerplate/boilerplate.py
View File

@@ -19,8 +19,6 @@ from __future__ import print_function
import argparse import argparse
import difflib import difflib
import glob import glob
import json
import mmap
import os import os
import re import re
import sys import sys
@@ -33,12 +31,12 @@ parser.add_argument(
nargs='*') nargs='*')
# Rootdir defaults to the directory **above** the repo-infra dir. # Rootdir defaults to the directory **above** the repo-infra dir.
rootdir = os.path.dirname(__file__) + "./../../../" rootdir = os.path.dirname(__file__) + "./../../"
rootdir = os.path.abspath(rootdir) rootdir = os.path.abspath(rootdir)
parser.add_argument( parser.add_argument(
"--rootdir", default=rootdir, help="root directory to examine") "--rootdir", default=rootdir, help="root directory to examine")
default_boilerplate_dir = os.path.join(rootdir, "csi-driver-nfs/hack/boilerplate") default_boilerplate_dir = os.path.abspath(os.path.dirname(__file__))
parser.add_argument( parser.add_argument(
"--boilerplate-dir", default=default_boilerplate_dir) "--boilerplate-dir", default=default_boilerplate_dir)
@@ -199,4 +197,4 @@ def main():
return 0 return 0
if __name__ == "__main__": if __name__ == "__main__":
sys.exit(main()) sys.exit(main())

2
release-tools/prow.sh
View File

@@ -71,7 +71,7 @@ version_to_git () {
version="$1" version="$1"
shift shift
case "$version" in case "$version" in
latest) echo "master";; latest|master) echo "master";;
release-*) echo "$version";; release-*) echo "$version";;
*) echo "v$version";; *) echo "v$version";;
esac esac