From 06c9446cd6b580cbcb13a1489efcb3e943b470af Mon Sep 17 00:00:00 2001 From: Ben Parees Date: Thu, 10 Aug 2017 13:40:43 -0400 Subject: [PATCH] update exclusions in rebase script --- hack/rebase-to-origin.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hack/rebase-to-origin.sh b/hack/rebase-to-origin.sh index 09078e8bd..5e12aa850 100755 --- a/hack/rebase-to-origin.sh +++ b/hack/rebase-to-origin.sh @@ -17,6 +17,7 @@ readonly S2I_ROOT=$( cd "${root}" pwd ) +#readonly OS_ROOT="${S2I_ROOT/%\/source-to-image/\/ose}" readonly OS_ROOT="${S2I_ROOT/%\/source-to-image/\/origin}" source "${S2I_ROOT}/hack/util.sh" @@ -29,6 +30,7 @@ readonly exclude_pkgs=( pkg/docker/test pkg/run pkg/version + pkg/test ) readonly origin_s2i_vendor_dir="${OS_ROOT}/vendor/github.com/openshift/source-to-image"