obs: factor out projects array.

projects array is used in two scripts move it to
obs-pkgs.sh

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz 2018-08-20 19:15:52 -05:00
parent afe2dff5c3
commit b66368fbe0
3 changed files with 25 additions and 24 deletions

View File

@ -12,18 +12,9 @@ set -o pipefail
readonly script_name="$(basename "${BASH_SOURCE[0]}")" readonly script_name="$(basename "${BASH_SOURCE[0]}")"
readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" 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. # shellcheck source=scripts/obs-docker.sh
projects=( source "${script_dir}/scripts/obs-pkgs.sh"
qemu-lite
qemu-vanilla
kernel
kata-containers-image
proxy
shim
ksm-throttler
runtime
)
OSCRC="${HOME}/.oscrc" OSCRC="${HOME}/.oscrc"
PUSH=${PUSH:-""} PUSH=${PUSH:-""}
@ -64,7 +55,7 @@ eom
fi fi
pushd "${script_dir}" pushd "${script_dir}"
for p in "${projects[@]}"; do for p in "${OBS_PKGS_PROJECTS[@]}"; do
if [[ "$GO_ARCH" != "amd64" && "$p" == "qemu-lite" ]]; then if [[ "$GO_ARCH" != "amd64" && "$p" == "qemu-lite" ]]; then
echo "Skipping packaging qemu-lite as its only for amd64 arch" echo "Skipping packaging qemu-lite as its only for amd64 arch"
continue continue

View File

@ -23,16 +23,8 @@ readonly home_project="home:katacontainers"
readonly template_pkg="kata-pkg-template" readonly template_pkg="kata-pkg-template"
arch_target=${ARCH:-$(uname -m)} arch_target=${ARCH:-$(uname -m)}
projects=( # shellcheck source=scripts/obs-docker.sh
qemu-lite source "${script_dir}/scripts/obs-pkgs.sh"
qemu-vanilla
linux-container
kata-containers-image
proxy
shim
ksm-throttler
runtime
)
pkg_exist() { pkg_exist() {
local project="$1" local project="$1"
@ -142,7 +134,7 @@ main() {
info "Creating/Updating project with name ${project_branch}" info "Creating/Updating project with name ${project_branch}"
# Update /Create project metadata. # Update /Create project metadata.
docker_run osc meta prj "${project_branch}" -F meta_project.xml 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 if ! pkg_exist "${project_branch}" "${pkg}"; then
echo "Package ${pkg} does not exit in ${project_branch}, creating ..." echo "Package ${pkg} does not exit in ${project_branch}, creating ..."
docker_run osc branch "${home_project}" "${template_pkg}" "${project_branch}" "${pkg}" docker_run osc branch "${home_project}" "${template_pkg}" "${project_branch}" "${pkg}"

View File

@ -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
)