mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-10 20:32:54 +00:00
obs: dont checkout repo in tmpdir.
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:
parent
b66368fbe0
commit
dbe64e6461
8
obs-packaging/Makefile
Normal file
8
obs-packaging/Makefile
Normal 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 {} \;
|
@ -48,6 +48,7 @@ main() {
|
|||||||
[ -f "${image_tarball}" ] || die "image not found"
|
[ -f "${image_tarball}" ] || die "image not found"
|
||||||
popd >>/dev/null
|
popd >>/dev/null
|
||||||
#Build all kata packages
|
#Build all kata packages
|
||||||
|
make -f "${script_dir}/Makefile" clean
|
||||||
docker_run "${packaging_repo_dir}/obs-packaging/build_all.sh ${branch}"
|
docker_run "${packaging_repo_dir}/obs-packaging/build_all.sh ${branch}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -128,7 +128,7 @@ function local_build() {
|
|||||||
[ ! -e $PACKAGING_DIR ] && mkdir $PACKAGING_DIR
|
[ ! -e $PACKAGING_DIR ] && mkdir $PACKAGING_DIR
|
||||||
[ ! -e $LOG_DIR ] && mkdir $LOG_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')
|
BUILD_ARGS=('--local-package' '--no-verify' '--noservice' '--trust-all-projects' '--keep-pkgs=/var/packaging/results')
|
||||||
[ "$OFFLINE" == "true" ] && BUILD_ARGS+=('--offline')
|
[ "$OFFLINE" == "true" ] && BUILD_ARGS+=('--offline')
|
||||||
@ -147,22 +147,24 @@ function local_build() {
|
|||||||
${distro} $BUILD_ARCH *.dsc | tee ${LOG_DIR}/${distro}_${PKG_NAME}_build.log
|
${distro} $BUILD_ARCH *.dsc | tee ${LOG_DIR}/${distro}_${PKG_NAME}_build.log
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
popd
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function checkout_repo() {
|
function checkout_repo() {
|
||||||
local REPO="${1}"
|
local repo="${1}"
|
||||||
if [ -z "${OBS_WORKDIR:-}" ]; then
|
export obs_repo_dir="${repo}"
|
||||||
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 {} \;
|
|
||||||
|
|
||||||
mv "${GENERATED_FILES[@]}" "${OBS_WORKDIR}"
|
mkdir -p "${obs_repo_dir}"
|
||||||
cp "${STATIC_FILES[@]}" "$OBS_WORKDIR"
|
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() {
|
function obs_push() {
|
||||||
pushd $OBS_WORKDIR
|
pushd "${obs_repo_dir}"
|
||||||
osc addremove
|
osc addremove
|
||||||
osc commit -m "Update ${PKG_NAME} $VERSION: ${hash_tag:0:7}"
|
osc commit -m "Update ${PKG_NAME} $VERSION: ${hash_tag:0:7}"
|
||||||
popd
|
popd
|
||||||
@ -189,10 +191,6 @@ function cli() {
|
|||||||
PROJECT_REPO="$2"
|
PROJECT_REPO="$2"
|
||||||
shift 2
|
shift 2
|
||||||
;;
|
;;
|
||||||
-w | --workdir)
|
|
||||||
OBS_WORKDIR="$2"
|
|
||||||
shift 2
|
|
||||||
;;
|
|
||||||
-v | --verbose)
|
-v | --verbose)
|
||||||
VERBOSE="true"
|
VERBOSE="true"
|
||||||
shift
|
shift
|
||||||
|
Loading…
Reference in New Issue
Block a user