David Caro has uploaded a new change for review. Change subject: Allowing empty .req files on standard build ......................................................................
Allowing empty .req files on standard build Change-Id: I63651e622c722262e890e4c5b690a06cf62b161e Signed-off-by: David Caro <[email protected]> --- M jobs/confs/shell-scripts/standard_build_artifacts.sh M jobs/confs/shell-scripts/standard_check_merged.sh M jobs/confs/shell-scripts/standard_check_patch.sh 3 files changed, 28 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/57/40957/1 diff --git a/jobs/confs/shell-scripts/standard_build_artifacts.sh b/jobs/confs/shell-scripts/standard_build_artifacts.sh index 322d989..fd7e36e 100644 --- a/jobs/confs/shell-scripts/standard_build_artifacts.sh +++ b/jobs/confs/shell-scripts/standard_build_artifacts.sh @@ -86,15 +86,19 @@ --install "${{extra_packages[@]}}" fi ## from project requirements file -build_deps_file="$project/automation/build-artifacts.req.${{distro}}" +build_deps_file="$project/automation/check-merged.req.${{distro}}" [[ -f "$build_deps_file" ]] \ -|| build_deps_file="$project/automation/build-artifacts.req" +|| build_deps_file="$project/automation/check-merged.req" if [[ -f "$build_deps_file" ]]; then - echo "##### Installing extra dependencies from $build_deps_file" packages=($(cat "$build_deps_file")) - $my_mock \ - --no-clean \ - --install "${{packages[@]}}" + if [[ -n "${{packages}}" ]]; then + echo "##### Installing extra dependencies from $build_deps_file" + $my_mock \ + --no-clean \ + --install "${{packages[@]}}" + else + echo "#### WARN: empty req file found $build_deps_file" + fi fi ## Needed when running yum inside the chroot on different distro than the host, diff --git a/jobs/confs/shell-scripts/standard_check_merged.sh b/jobs/confs/shell-scripts/standard_check_merged.sh index 9b40315..f7fbe98 100644 --- a/jobs/confs/shell-scripts/standard_check_merged.sh +++ b/jobs/confs/shell-scripts/standard_check_merged.sh @@ -90,11 +90,15 @@ [[ -f "$build_deps_file" ]] \ || build_deps_file="$project/automation/check-merged.req" if [[ -f "$build_deps_file" ]]; then - echo "##### Installing extra dependencies from $build_deps_file" packages=($(cat "$build_deps_file")) - $my_mock \ - --no-clean \ - --install "${{packages[@]}}" + if [[ -n "${{packages}}" ]]; then + echo "##### Installing extra dependencies from $build_deps_file" + $my_mock \ + --no-clean \ + --install "${{packages[@]}}" + else + echo "#### WARN: empty req file found $build_deps_file" + fi fi ## Needed when running yum inside the chroot on different distro than the host, diff --git a/jobs/confs/shell-scripts/standard_check_patch.sh b/jobs/confs/shell-scripts/standard_check_patch.sh index cdcba1c..629c2da 100644 --- a/jobs/confs/shell-scripts/standard_check_patch.sh +++ b/jobs/confs/shell-scripts/standard_check_patch.sh @@ -86,15 +86,19 @@ --install "${{extra_packages[@]}}" fi ## from project requirements file -build_deps_file="$project/automation/check-patch.req.${{distro}}" +build_deps_file="$project/automation/check-merged.req.${{distro}}" [[ -f "$build_deps_file" ]] \ -|| build_deps_file="$project/automation/check-patch.req" +|| build_deps_file="$project/automation/check-merged.req" if [[ -f "$build_deps_file" ]]; then - echo "##### Installing extra dependencies from $build_deps_file" packages=($(cat "$build_deps_file")) - $my_mock \ - --no-clean \ - --install "${{packages[@]}}" + if [[ -n "${{packages}}" ]]; then + echo "##### Installing extra dependencies from $build_deps_file" + $my_mock \ + --no-clean \ + --install "${{packages[@]}}" + else + echo "#### WARN: empty req file found $build_deps_file" + fi fi ## Needed when running yum inside the chroot on different distro than the host, -- To view, visit https://gerrit.ovirt.org/40957 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I63651e622c722262e890e4c5b690a06cf62b161e Gerrit-PatchSet: 1 Gerrit-Project: jenkins Gerrit-Branch: master Gerrit-Owner: David Caro <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
