Fixing broken tests caused by #2428 (#2461)

The changed.sh script tried to find the merge base but the merge
base branch was not available. This change provides it so that
a common ancestor can be found.
This commit is contained in:
Matt Farina
2017-10-12 11:15:23 +02:00
committed by Adnan Abdulhussein
parent e0e6f21fec
commit 4baaa42525
+3 -2
View File
@@ -18,10 +18,11 @@ set -o nounset
set -o pipefail
set -o xtrace
git fetch --tags https://github.com/kubernetes/charts master
git remote add k8s https://github.com/kubernetes/charts
git fetch k8s master
NAMESPACE="pr-${PULL_NUMBER}-${BUILD_NUMBER}"
CHANGED_FOLDERS=`git diff --find-renames --name-only $(git merge-base master HEAD) stable/ incubator/ | awk -F/ '{print $1"/"$2}' | uniq`
CHANGED_FOLDERS=`git diff --find-renames --name-only $(git merge-base k8s/master HEAD) stable/ incubator/ | awk -F/ '{print $1"/"$2}' | uniq`
CURRENT_RELEASE=""
# Exit early if no charts have changed