Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the build (better) #4084

Merged
merged 1 commit into from
Feb 3, 2015
Merged

Fix the build (better) #4084

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 15 additions & 11 deletions build/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,18 +467,18 @@ function kube::build::copy_output() {

# ---------------------------------------------------------------------------
# Build final release artifacts
function kube::release::clean_cruft() {
# Clean out cruft
find ${RELEASE_STAGE} -name '*~' -exec rm {} \;
find ${RELEASE_STAGE} -name '#*#' -exec rm {} \;
find ${RELEASE_STAGE} -name '.DS*' -exec rm {} \;
}

function kube::release::package_tarballs() {
# Clean out any old releases
rm -rf "${RELEASE_DIR}"
mkdir -p "${RELEASE_DIR}"

# Clean out cruft
if [ -d "_output/release-stage/" ]; then
find _output/release-stage/ -name '*~' -exec rm {} \;
find _output/release-stage/ -name '#*#' -exec rm {} \;
find _output/release-stage/ -name '.DS*' -exec rm {} \;
fi

kube::release::package_client_tarballs
kube::release::package_server_tarballs
kube::release::package_salt_tarball
Expand Down Expand Up @@ -511,6 +511,7 @@ function kube::release::package_client_tarballs() {
cp "${client_bins[@]/#/${LOCAL_OUTPUT_BINPATH}/${platform}/}" \
"${release_stage}/client/bin/"

kube::release::clean_cruft

local package_name="${RELEASE_DIR}/kubernetes-client-${platform_tag}.tar.gz"
kube::release::create_tarball "${package_name}" "${release_stage}/.."
Expand Down Expand Up @@ -542,6 +543,8 @@ function kube::release::package_server_tarballs() {
cp "${client_bins[@]/#/${LOCAL_OUTPUT_BINPATH}/${platform}/}" \
"${release_stage}/server/bin/"

kube::release::clean_cruft

local package_name="${RELEASE_DIR}/kubernetes-server-${platform_tag}.tar.gz"
kube::release::create_tarball "${package_name}" "${release_stage}/.."
done
Expand All @@ -566,6 +569,8 @@ function kube::release::package_salt_tarball() {
objects=$(cd "${KUBE_ROOT}/cluster/addons" && find . -name \*.yaml -or -name \*.yaml.in | grep -v demo)
tar c -C "${KUBE_ROOT}/cluster/addons" ${objects} | tar x -C "${release_stage}/saltbase/salt/kube-addons"

kube::release::clean_cruft

local package_name="${RELEASE_DIR}/kubernetes-salt.tar.gz"
kube::release::create_tarball "${package_name}" "${release_stage}/.."
}
Expand All @@ -591,6 +596,8 @@ function kube::release::package_test_tarball() {

tar c ${KUBE_TEST_PORTABLE[@]} | tar x -C ${release_stage}

kube::release::clean_cruft

local package_name="${RELEASE_DIR}/kubernetes-test.tar.gz"
kube::release::create_tarball "${package_name}" "${release_stage}/.."
}
Expand Down Expand Up @@ -637,10 +644,7 @@ function kube::release::package_full_tarball() {
cp "${KUBE_ROOT}/LICENSE" "${release_stage}/"
cp "${KUBE_ROOT}/Vagrantfile" "${release_stage}/"

# Clean out cruft
find ${release_stage} -name '*~' -exec rm {} \;
find ${release_stage} -name '#*#' -exec rm {} \;
find ${release_stage} -name '.DS*' -exec rm {} \;
kube::release::clean_cruft

local package_name="${RELEASE_DIR}/kubernetes.tar.gz"
kube::release::create_tarball "${package_name}" "${release_stage}/.."
Expand Down