diff --git a/obs-packaging/build_all.sh b/obs-packaging/build_all.sh index f2fad2780..5d7f313df 100755 --- a/obs-packaging/build_all.sh +++ b/obs-packaging/build_all.sh @@ -12,18 +12,9 @@ set -o pipefail readonly script_name="$(basename "${BASH_SOURCE[0]}")" readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -#Note:Lets update qemu and the kernel first, they take longer to build. -#Note: runtime is build at the end to get the version from all its dependencies. -projects=( - qemu-lite - qemu-vanilla - kernel - kata-containers-image - proxy - shim - ksm-throttler - runtime -) + +# shellcheck source=scripts/obs-docker.sh +source "${script_dir}/scripts/obs-pkgs.sh" OSCRC="${HOME}/.oscrc" PUSH=${PUSH:-""} @@ -64,7 +55,7 @@ eom fi pushd "${script_dir}" - for p in "${projects[@]}"; do + for p in "${OBS_PKGS_PROJECTS[@]}"; do if [[ "$GO_ARCH" != "amd64" && "$p" == "qemu-lite" ]]; then echo "Skipping packaging qemu-lite as its only for amd64 arch" continue diff --git a/obs-packaging/create-repo-branch.sh b/obs-packaging/create-repo-branch.sh index 8057e9bfe..6c0123d2f 100755 --- a/obs-packaging/create-repo-branch.sh +++ b/obs-packaging/create-repo-branch.sh @@ -23,16 +23,8 @@ readonly home_project="home:katacontainers" readonly template_pkg="kata-pkg-template" arch_target=${ARCH:-$(uname -m)} -projects=( - qemu-lite - qemu-vanilla - linux-container - kata-containers-image - proxy - shim - ksm-throttler - runtime -) +# shellcheck source=scripts/obs-docker.sh +source "${script_dir}/scripts/obs-pkgs.sh" pkg_exist() { local project="$1" @@ -142,7 +134,7 @@ main() { info "Creating/Updating project with name ${project_branch}" # Update /Create project metadata. docker_run osc meta prj "${project_branch}" -F meta_project.xml - for pkg in "${projects[@]}"; do + for pkg in "${OBS_PKGS_PROJECTS[@]}"; do if ! pkg_exist "${project_branch}" "${pkg}"; then echo "Package ${pkg} does not exit in ${project_branch}, creating ..." docker_run osc branch "${home_project}" "${template_pkg}" "${project_branch}" "${pkg}" diff --git a/obs-packaging/scripts/obs-pkgs.sh b/obs-packaging/scripts/obs-pkgs.sh new file mode 100755 index 000000000..e5c634b0b --- /dev/null +++ b/obs-packaging/scripts/obs-pkgs.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# Copyright (c) 2018 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 +# + +#Note:Lets update qemu and the kernel first, they take longer to build. +#Note: runtime is build at the end to get the version from all its dependencies. +OBS_PKGS_PROJECTS=( + qemu-lite + qemu-vanilla + kernel + kata-containers-image + proxy + shim + ksm-throttler + runtime +)