From 3254a8d116bb743e84f12da6ff49255dcad71f99 Mon Sep 17 00:00:00 2001 From: Matthew Wong Date: Tue, 13 Jul 2021 14:31:46 -0700 Subject: [PATCH] Add how to consume new hack/e2e scripts in other repos (efs/fsx) --- hack/e2e/README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/hack/e2e/README.md b/hack/e2e/README.md index 538f0aa021..d245cd31b0 100644 --- a/hack/e2e/README.md +++ b/hack/e2e/README.md @@ -41,7 +41,16 @@ To commit changes and submit them as a PR back to the ebs repo: ``` git diff ebs/master:hack/e2e HEAD:hack/e2e > /tmp/hack_e2e.diff -cd $GOPATH/src/github.com/kubernetes-sigs/aws-ebs-csi-driver +pushd $GOPATH/src/github.com/kubernetes-sigs/aws-ebs-csi-driver +git apply --reject --directory hack/e2e /tmp/hack_e2e.diff +git commit +``` + +To consume newer changes from the ebs repo: + +``` +git fetch ebs +git diff HEAD:hack/e2e ebs/master:hack/e2e > /tmp/hack_e2e.diff git apply --reject --directory hack/e2e /tmp/hack_e2e.diff git commit ```