Add OS and arch in release tarball.

Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2017-12-13 22:20:18 +00:00
parent 737efe70a7
commit ec975b2e7a
10 changed files with 54 additions and 19 deletions

View File

@@ -63,7 +63,8 @@ CONTAINERD_PKG=github.com/containerd/containerd
CRITOOL_PKG=github.com/kubernetes-incubator/cri-tools
# Create a temporary GOPATH for make install.deps.
GOPATH=$(mktemp -d /tmp/cri-containerd-install-deps.XXXX)
TMPGOPATH=$(mktemp -d /tmp/cri-containerd-install-deps.XXXX)
GOPATH=${TMPGOPATH}
# checkout_repo checks out specified repository
# and switch to specified version.
@@ -146,5 +147,6 @@ ${sudo} bash -c 'cat >'${CRICTL_CONFIG_DIR}'/crictl.yaml <<EOF
runtime-endpoint: /var/run/cri-containerd.sock
EOF'
# Clean the tmp GOPATH dir
${sudo} rm -r ${GOPATH}
# Clean the tmp GOPATH dir. Use sudo because runc build generates
# some privileged files.
${sudo} rm -rf ${TMPGOPATH}

View File

@@ -34,7 +34,8 @@ LATEST=${LATEST:-"latest"}
PUSH_VERSION=${PUSH_VERSION:-false}
release_tar=${ROOT}/${BUILD_DIR}/${TARBALL}
if [ ! -e ${release_tar} ]; then
release_tar_checksum=${release_tar}.sha1
if [[ ! -e ${release_tar} || ! -e ${release_tar_checksum} ]]; then
echo "Release tarball is not built"
exit 1
fi
@@ -51,6 +52,7 @@ fi
# TODO(random-liu): Add checksum for the tarball.
gsutil cp ${release_tar} "gs://${DEPLOY_PATH}/"
gsutil cp ${release_tar_checksum} "gs://${DEPLOY_PATH}/"
echo "Release tarball is uploaded to:
https://storage.googleapis.com/${DEPLOY_PATH}/${TARBALL}"

View File

@@ -18,7 +18,7 @@ set -o errexit
set -o nounset
set -o pipefail
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
source $(dirname "${BASH_SOURCE[0]}")/test-utils.sh
cd ${ROOT}
# BUILD_DIR is the directory to generate release tar.
@@ -45,4 +45,8 @@ mkdir -p ${destdir}/opt/cri-containerd
cp -r ${ROOT}/cluster ${destdir}/opt/cri-containerd
# Create release tar
tar -zcvf ${BUILD_DIR}/${TARBALL} -C ${destdir} .
tarball=${BUILD_DIR}/${TARBALL}
tar -zcvf ${tarball} -C ${destdir} .
checksum=$(sha1 ${tarball})
echo "sha1sum: ${checksum} ${tarball}"
echo ${checksum} > ${tarball}.sha1

View File

@@ -122,3 +122,14 @@ create_ttl_bucket() {
gsutil -m acl ch -g all:R "gs://${bucket}"
gsutil defacl set public-read "gs://${bucket}"
}
# sha1 generates a sha1 checksum for a file.
# Var set:
# 1. Filename.
sha1() {
if which sha1sum >/dev/null 2>&1; then
sha1sum "$1" | awk '{ print $1 }'
else
shasum -a1 "$1" | awk '{ print $1 }'
fi
}