github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-31 15:25:26 +00:00
Code Issues Projects Releases Wiki Activity

obs: dont checkout repo in tmpdir.

Browse Source 
When we genete packages file we want to see
the resulting files. This changes to now
create repos in a tmpdir.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz 2018-08-21 13:55:11 -05:00
parent b66368fbe0
commit dbe64e6461
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
obs-packaging/Makefile Normal file
View File

@ -0,0 +1,8 @@
# Copyright (c) 2018 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#
clean:
find . -type d -name "*home:katacontainers*" -exec sudo rm -rf {} \;

1
obs-packaging/build_from_docker.sh
View File

@ -48,6 +48,7 @@ main() {
[ -f "${image_tarball}" ] || die "image not found"
popd >>/dev/null
#Build all kata packages
make -f "${script_dir}/Makefile" clean
docker_run "${packaging_repo_dir}/obs-packaging/build_all.sh ${branch}"
}

26
obs-packaging/scripts/pkglib.sh
View File

@ -128,7 +128,7 @@ function local_build() {
[ ! -e $PACKAGING_DIR ] && mkdir $PACKAGING_DIR
[ ! -e $LOG_DIR ] && mkdir $LOG_DIR
pushd $OBS_WORKDIR
pushd "${obs_repo_dir}"
BUILD_ARGS=('--local-package' '--no-verify' '--noservice' '--trust-all-projects' '--keep-pkgs=/var/packaging/results')
[ "$OFFLINE" == "true" ] && BUILD_ARGS+=('--offline')
@ -147,22 +147,24 @@ function local_build() {
${distro} $BUILD_ARCH *.dsc | tee ${LOG_DIR}/${distro}_${PKG_NAME}_build.log
fi
done
popd
}
function checkout_repo() {
local REPO="${1}"
if [ -z "${OBS_WORKDIR:-}" ]; then
OBS_WORKDIR=$(mktemp -d -u -t obs-repo.XXXXXXXXXXX) || exit 1
osc co "${REPO}" -o "${OBS_WORKDIR}"
fi
find "${OBS_WORKDIR}" -maxdepth 1 -mindepth 1 ! -name '.osc' -prune -exec echo remove {} \; -exec rm -rf {} \;
local repo="${1}"
export obs_repo_dir="${repo}"
mv "${GENERATED_FILES[@]}" "${OBS_WORKDIR}"
cp "${STATIC_FILES[@]}" "$OBS_WORKDIR"
mkdir -p "${obs_repo_dir}"
osc co "${repo}" -o "${obs_repo_dir}"
find "${obs_repo_dir}" -maxdepth 1 -mindepth 1 ! -name '.osc' -prune -exec echo remove {} \; -exec rm -rf {} \;
mv "${GENERATED_FILES[@]}" "${obs_repo_dir}"
cp "${STATIC_FILES[@]}" "$obs_repo_dir"
}
function obs_push() {
pushd $OBS_WORKDIR
pushd "${obs_repo_dir}"
osc addremove
osc commit -m "Update ${PKG_NAME} $VERSION: ${hash_tag:0:7}"
popd
@ -189,10 +191,6 @@ function cli() {
PROJECT_REPO="$2"
shift 2
;;
-w | --workdir)
OBS_WORKDIR="$2"
shift 2
;;
-v | --verbose)
VERBOSE="true"
shift