feedc0de/my-rook-config
1
0 Fork 0
forked from rook/rook
Code Pull Requests Activity

build: support for promoting a build

Browse Source 
support for build promotion. For example, make promote CHANNEL=alpha VERISON=v0.4.0, will push the v0.4.0 bits to the alpha channel.
This commit is contained in:
Bassam Tabbara committed 2017-04-04 17:02:25 -07:00
1 parent 1245e6022a
commit 59f5815115
10 files changed
+244 -87
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Jenkinsfile
Vendored
+9 -6
View File
@@ -24,18 +24,19 @@ try {
}
stage('Publish') {
withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'rook-quay-io',
usernameVariable: 'DOCKER_USER', passwordVariable: 'DOCKER_PASSWORD']]) {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: 'rook-quay-io', usernameVariable: 'DOCKER_USER', passwordVariable: 'DOCKER_PASSWORD'],
[$class: 'UsernamePasswordMultiBinding', credentialsId: 'rook-jenkins-aws', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'],
[$class: 'StringBinding', credentialsId: 'quantumbuild-token', variable: 'GITHUB_TOKEN']
]) {
sh 'docker login -u="${DOCKER_USER}" -p="${DOCKER_PASSWORD}" quay.io'
}
withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'rook-jenkins-aws',
usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY']]) {
sh 'build/run make -j\$(nproc) publish'
}
}
stage('Cleanup') {
sh 'build/run make -j\$(nproc) publish.cleanup'
sh 'docker images'
deleteDir()
}
}
@@ -46,6 +47,8 @@ catch (Exception e) {
node("ec2-stateful") {
echo 'Cleaning up workspace'
sh 'build/run make -j\$(nproc) publish.cleanup'
sh 'docker images'
deleteDir()
}
Makefile
+7
View File
@@ -238,6 +238,13 @@ else
@echo skipping publish. invalid channel "$(CHANNEL)"
endif
promote:
ifneq ($(filter master alpha beta stable, $(CHANNEL)),)
@$(MAKE) release.promote
else
@echo skipping promote. invalid channel "$(CHANNEL)"
endif
publish.cleanup:
ifneq ($(filter master alpha beta stable, $(CHANNEL)),)
@$(MAKE) release.cleanup
build/common.sh
+1 -3
View File
@@ -88,10 +88,8 @@ function run_rsync() {
--delete \
--prune-empty-dirs \
--filter='- /.work/' \
--filter='- /.glide/' \
--filter='- /.vscode/' \
--filter='- /bin/' \
--filter='- /release/' \
--filter='- index.lock' \
$src $dst || { stop_rsync_container ${id}; return 1; }
done
build/makelib/release.mk
+20 -2
View File
@@ -44,7 +44,7 @@ RELEASE_PLATFORMS ?=
RELEASE_CLIENT_ONLY_PLATFORMS ?=
# Optional. the flavors to release
RELEASE_FLAVORS := binaries containers
RELEASE_FLAVORS := metadata binaries containers
# Optional. Github token repo and user
GITHUB_TOKEN ?=
@@ -61,7 +61,16 @@ RELEASE_S3_BUCKET ?= rook-release
export RELEASE_VERSION RELEASE_CHANNEL RELEASE_BIN_DIR RELEASE_DIR
export GITHUB_TOKEN GITHUB_USER GITHUB_REPO
export RELEASE_S3_BUCKET RELEASE_REGISTRY
export AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_DEFAULT_REGION
ifneq ($(AWS_ACCESS_KEY_ID),)
export AWS_ACCESS_KEY_ID
endif
ifneq ($(AWS_SECRET_ACCESS_KEY),)
export AWS_SECRET_ACCESS_KEY
endif
export AWS_DEFAULT_REGION
# ====================================================================================
# Targets
@@ -77,6 +86,11 @@ release.publish.$(1).$(2):
release.publish.all: release.publish.$(1).$(2)
release.promote.$(1).$(2):
@build/release/release.sh promote $(2) $(1)
release.promote.all: release.promote.$(1).$(2)
release.cleanup.$(1).$(2):
@build/release/release.sh cleanup $(2) $(1)
@@ -89,4 +103,8 @@ release.build: release.build.all
release.publish: release.publish.all
release.promote:
@build/release/release.sh init
@$(MAKE) release.promote.all
release.cleanup: release.cleanup.all
build/release/binaries.sh
+57 -24
View File
@@ -3,6 +3,34 @@
scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source ${scriptdir}/common.sh
get_archive_ext() {
local os=$1
local ext=tar.gz
if [[ ${os} != "linux" ]]; then
ext=zip
fi
echo ${ext}
}
get_archive_name() {
local os=$1
local arch=$2
local suffix=$3
local version=${RELEASE_VERSION}
local file=rook-${version}-${os}-${arch}
if [[ -n ${suffix} ]]; then
file=${file}-${suffix}
fi
local ext=$(get_archive_ext $os)
echo ${file}.${ext}
}
build() {
local os=$1
local arch=$2
@@ -18,48 +46,53 @@ build() {
if [[ ${os} == "linux" ]]; then
files+=( rookd${ext} )
local tarfile=${RELEASE_DIR}/rook-${version}-${os}-${arch}.tar.gz
local tarfile=$(get_archive_name $os $arch)
echo creating tar ${tarfile}
tar czf "${tarfile}" -C "${bindir}" ${files[*]}
tar czf "${RELEASE_DIR}/${tarfile}" -C "${bindir}" ${files[*]}
# create a package with debug symbols
files=( rookd${ext}.debug )
local tarfile=${RELEASE_DIR}/rook-${version}-${os}-${arch}-debug.tar.gz
local tarfile=$(get_archive_name $os $arch "debug")
echo creating debug tar ${tarfile}
tar czf "${tarfile}" -C "${bindir}" ${files[*]}
tar czf "${RELEASE_DIR}/${tarfile}" -C "${bindir}" ${files[*]}
else
local zipfile=$(realpath ${RELEASE_DIR}/rook-${version}-${os}-${arch}.zip)
local zipfile=$(get_archive_name $os $arch)
local zippath=$(realpath ${RELEASE_DIR}/${zipfile})
echo creating zip ${zipfile}
$(cd ${bindir} && zip -qr ${zipfile} ${files[*]})
$(cd ${bindir} && zip -qr ${zippath} ${files[*]})
fi
}
publish() {
local os=$1
local arch=$2
local version=${RELEASE_VERSION}
local file=$(get_archive_name $os $arch)
local file=${RELEASE_DIR}/rook-${version}-${os}-${arch}
local ext=tar.gz
if [[ ${os} != "linux" ]]; then
ext=zip
fi
echo uploading $file.$ext to S3
s3_upload $file.$ext
echo uploading $file to S3
s3_upload ${RELEASE_DIR}/$file
if [[ ${os} == "linux" ]]; then
echo uploading $file-debug.$ext to S3
s3_upload $file-debug.$ext
file=$(get_archive_name $os $arch "debug")
echo uploading $file to S3
s3_upload ${RELEASE_DIR}/$file
fi
}
# upload a file with the version number
tmpdir=$(mktemp -d)
cat <<EOF > $tmpdir/version
${version}
EOF
s3_upload $tmpdir/version
promote() {
local os=$1
local arch=$2
local file=$(get_archive_name $os $arch)
local ext=$(get_archive_ext $os)
echo promoting $file to channel ${RELEASE_CHANNEL}
s3_promote_file $file
github_upload ${RELEASE_DIR}/$file $ext
if [[ ${os} == "linux" ]]; then
file=$(get_archive_name $os $arch "debug")
s3_promote_file $file
github_upload ${RELEASE_DIR}/$file $ext
fi
}
cleanup() {
build/release/common.sh
+20 -3
View File
@@ -28,17 +28,27 @@ layout_root() {
cp /etc/ssl/certs/ca-certificates.crt $dir/root/etc/ssl/certs
}
check_release_version() {
if echo ${RELEASE_VERSION} | grep -q -E '^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$'; then
return 0
else
return 1
fi
}
github_get_release_id() {
curl -4 -s -H "Authorization: token ${GITHUB_TOKEN}" \
"https://api.github.com/repos/${GITHUB_USER}/${GITHUB_REPO}/releases/tags/${RELEASE_VERSION}" | jq -r '.id'
}
github_check_release() {
github_create_release() {
id=$(github_get_release_id)
if [[ ${id} == "null" ]]; then
echo "ERROR: github release tag ${RELEASE_VERSION} was not found. Did you create the release?" 1>&2
return 1;
curl -4 -s -H "Authorization: token ${GITHUB_TOKEN}" \
-H "Content-Type: application/json" \
-d "{\"tag_name\": \"${RELEASE_VERSION}\",\"target_commitish\": \"master\",\"name\": \"${RELEASE_VERSION}\",\"body\": \"TBD\",\"draft\": true,\"prerelease\": true}" \
"https://api.github.com/repos/${GITHUB_USER}/${GITHUB_REPO}/releases"
fi
}
@@ -64,3 +74,10 @@ s3_upload() {
# or ~/.aws/credentials and ~/.aws/config are configured
aws s3 cp --only-show-errors ${filepath} s3://${RELEASE_S3_BUCKET}/${RELEASE_CHANNEL}/${RELEASE_VERSION}/${filename}
}
s3_promote_file() {
local filename=$1
aws s3 cp --only-show-errors s3://${RELEASE_S3_BUCKET}/master/${RELEASE_VERSION}/${filename} s3://${RELEASE_S3_BUCKET}/${RELEASE_CHANNEL}/${RELEASE_VERSION}/${filename}
aws s3 cp --only-show-errors s3://${RELEASE_S3_BUCKET}/master/${RELEASE_VERSION}/${filename} s3://${RELEASE_S3_BUCKET}/${RELEASE_CHANNEL}/current/${filename}
}
build/release/containers.sh
+91 -43
View File
@@ -5,6 +5,47 @@ source ${scriptdir}/common.sh
registry=${RELEASE_REGISTRY}/
get_image_name() {
local os=$1
local arch=$2
local repo=$3
local version=$4
local tag=${repo}-${arch}:${version}
if [[ ${arch} == "amd64" ]]; then
tag=${repo}:${version}
fi
echo ${tag}
}
build_artifact() {
local os=$1
local arch=$2
local tmpdir=$3
local repo=$4
shift 4
local bins="$@"
layout_root $os $arch $tmpdir $bins
mkdir $tmpdir/root/tmp
local name=$(get_image_name $os $arch $repo ${RELEASE_VERSION})
echo building docker container ${name}
docker build -t ${registry}${name} $tmpdir
local file=${name/\//-}
local file=${file/:/-}
local dockerout=${file}.docker
echo ${file}
echo generate ACIs from docker containers
(cd ${RELEASE_DIR} && docker save -o ${dockerout} ${registry}${name})
(cd ${RELEASE_DIR} && docker2aci ${dockerout})
}
build() {
local os=$1
local arch=$2
@@ -23,37 +64,15 @@ EOF
rm -fr $tmpdir
}
build_artifact() {
publish_artifact() {
local os=$1
local arch=$2
local tmpdir=$3
local repo=$4
local version=${RELEASE_VERSION}
local repo=$3
shift 4
local bins="$@"
local name=${registry}$(get_image_name $os $arch $repo ${RELEASE_VERSION})
layout_root $os $arch $tmpdir $bins
mkdir $tmpdir/root/tmp
tag=${repo}-${arch}:${version}
if [[ ${arch} == "amd64" ]]; then
tag=${repo}:${version}
fi
echo building docker container ${tag}
docker build -t ${registry}${tag} $tmpdir
local file=${tag/\//-}
local file=${file/:/-}
local dockerout=${file}.docker
echo ${file}
echo generate ACIs from docker containers
(cd ${RELEASE_DIR} && docker save -o ${dockerout} ${registry}${tag})
(cd ${RELEASE_DIR} && docker2aci ${dockerout})
rm -fr $tmpdir
echo pushing docker container ${name}
docker push ${name}
}
publish() {
@@ -65,28 +84,57 @@ publish() {
publish_artifact $os $arch rook/rookd
}
promote_artifact() {
local os=$1
local arch=$2
local repo=$3
local src=${registry}$(get_image_name $os $arch $repo ${RELEASE_VERSION})
local dst1=${registry}$(get_image_name $os $arch $repo ${RELEASE_CHANNEL}-latest)
local dst2=${registry}$(get_image_name $os $arch $repo ${RELEASE_CHANNEL}-${RELEASE_VERSION})
echo promoting container ${src} to ${dst1} and ${dst2}
docker pull ${src}
docker tag ${src} ${dst1}
docker tag ${src} ${dst2}
docker push ${dst1}
docker push ${dst2}
}
promote() {
local os=$1
local arch=$2
[[ ${os} == "linux" ]] || return 0
promote_artifact $os $arch rook/rookd
}
cleanup_artifact() {
local os=$1
local arch=$2
local repo=$3
local src=${registry}$(get_image_name $os $arch $repo ${RELEASE_VERSION})
echo removing docker image ${src}
docker rmi ${src} || true
local dst1=${registry}$(get_image_name $os $arch $repo ${RELEASE_CHANNEL}-latest)
echo removing docker image ${dst1}
docker rmi ${dst1} || true
local dst2=${registry}$(get_image_name $os $arch $repo ${RELEASE_CHANNEL}-${RELEASE_VERSION})
echo removing docker image ${dst2}
docker rmi ${dst2} || true
}
cleanup() {
local os=$1
local arch=$2
[[ ${os} == "linux" ]] || return 0
docker rmi ${registry}${tag} || true
}
publish_artifact() {
local os=$1
local arch=$2
local repo=$3
local version=${RELEASE_VERSION}
tag=${repo}-${arch}:${version}
if [[ ${arch} == "amd64" ]]; then
tag=${repo}:${version}
fi
echo pushing docker container ${tag}
docker push ${registry}${tag}
cleanup_artifact $os $arch rook/rookd
}
action=$1
build/release/metadata.sh
Executable
+28
View File
@@ -0,0 +1,28 @@
#!/bin/bash -e
scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source ${scriptdir}/common.sh
build() {
# upload a file with the version number
cat <<EOF > ${RELEASE_DIR}/version
${version}
EOF
}
publish() {
s3_upload ${RELEASE_DIR}/version
}
promote() {
s3_promote_file version
}
cleanup() {
:
}
action=$1
shift
${action} "$@"
build/release/release.sh
+7 -3
View File
@@ -9,7 +9,7 @@ shift
mkdir -p ${RELEASE_DIR}
case ${action} in
build|publish|cleanup)
build|publish|promote|cleanup)
platform=$1
shift
@@ -19,8 +19,12 @@ case ${action} in
${scriptdir}/${flavor}.sh ${action} ${platform%_*} ${platform#*_}
;;
check)
github_check_release "$@"
init)
if check_release_version; then
echo ${RELEASE_VERSION} can not be promoted. Must build from a tag like v0.4.0.
exit 1
fi
github_create_release
;;
*)
build/run
+4 -3
View File
@@ -58,7 +58,8 @@ if [ "`uname -s`" != "Linux" ]; then
# /var/run/docker.sock (bind mounted to host /var/run/docker.sock)
# /${BUILDER_HOME} (bind mounted to an independent docker volume)
# /.netrc (bind mounted to host ${HOME}/.netrc)
# /.docker/config.json (bind mounted to host ${HOME}/.docker/config.json)
# /.aws (bind mounted to host ${HOME}/.aws)
# /.docker (bind mounted to host ${HOME}/.docker)
# /.download
# /.ccache
# /go/src/github.com/rook/rook (rsync'd from host <source>)
@@ -80,7 +81,8 @@ else
# /var/run/docker.sock (bind mounted to host /var/run/docker.sock)
# /${BUILDER_HOME}
# /.netrc (bind mounted to host ${HOME}/.netrc)
# /.docker/config.json (bind mounted to host ${HOME}/.docker/config.json)
# /.aws (bind mounted to host ${HOME}/.aws)
# /.docker (bind mounted to host ${HOME}/.docker)
# /.ccache (bind mounted to host ${CCACHE_DIR})
# /.download (bind mounted to host ${DOWNLOADDIR} if set)
# /go (bind mounted to <source>/.work/cross )
@@ -152,7 +154,6 @@ docker run \
${container_image} \
"$@"
# rsync the source tree back
if [ "`uname -s`" != "Linux" ]; then
run_rsync "rsync://localhost:${rsync_port}/volume/go/src/${source_repo}-->${scriptdir}/../.."