Skip to content

Commit

Permalink
Export patch files to artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
cblecker committed Mar 25, 2017
1 parent 71d1e89 commit 3ad1329
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
3 changes: 3 additions & 0 deletions hack/jenkins/verify-dockerized.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ retry() {

export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH}

# Set artifacts directory
export ARTIFACTS_DIR=${WORKSPACE}/artifacts

retry go get github.com/tools/godep && godep version

export LOG_LEVEL=4
Expand Down
10 changes: 10 additions & 0 deletions hack/verify-godeps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,12 @@ pushd "${KUBE_ROOT}" 2>&1 > /dev/null
echo "If you're seeing this locally, run the below command to fix your Godeps.json:"
echo "patch -p0 < godepdiff.patch"
echo "(The above output can be saved as godepdiff.patch if you're not running this locally)"
echo "(The patch file should also be exported as a build artifact if run through CI)"
KEEP_TMP=true
if [[ -f godepdiff.patch && -d "${ARTIFACTS_DIR:-}" ]]; then
echo "Copying patch to artifacts.."
cp godepdiff.patch "${ARTIFACTS_DIR:-}/"
fi
ret=1
fi

Expand All @@ -128,7 +133,12 @@ pushd "${KUBE_ROOT}" 2>&1 > /dev/null
echo "If you're seeing this locally, run the below command to fix your directories:"
echo "patch -p0 < vendordiff.patch"
echo "(The above output can be saved as godepdiff.patch if you're not running this locally)"
echo "(The patch file should also be exported as a build artifact if run through CI)"
KEEP_TMP=true
if [[ -f vendordiff.patch && -d "${ARTIFACTS_DIR:-}" ]]; then
echo "Copying patch to artifacts.."
cp vendordiff.patch "${ARTIFACTS_DIR:-}/"
fi
ret=1
fi
popd 2>&1 > /dev/null
Expand Down

0 comments on commit 3ad1329

Please sign in to comment.