diff options
Diffstat (limited to 'ci/build_rpm')
| -rwxr-xr-x | ci/build_rpm/build_rpms.sh | 2 | ||||
| -rwxr-xr-x | ci/build_rpm/build_rpms_docker.sh | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ci/build_rpm/build_rpms.sh b/ci/build_rpm/build_rpms.sh index 811eb13a..db5a42e9 100755 --- a/ci/build_rpm/build_rpms.sh +++ b/ci/build_rpm/build_rpms.sh @@ -40,7 +40,7 @@ function cleanup_container { echo "Removing containers... $containers_to_kill" (sudo docker rm -v -f ${containers_to_kill} 2>&1) > /dev/null - if [[ ! -z "$containers_to_kill" ]]; then + if [[ ! -z "$volumes_to_remove" ]]; then echo "Removing volumes... $volumes_to_remove" (sudo docker volume rm ${volumes_to_remove} 2>&1) || true > /dev/null fi diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh index 4434157a..bd0e0878 100755 --- a/ci/build_rpm/build_rpms_docker.sh +++ b/ci/build_rpm/build_rpms_docker.sh @@ -14,6 +14,8 @@ rpm_build_dir=/opt/daisy4nfv rpm_output_dir=$rpm_build_dir/build_output tmp_rpm_build_dir=/home/cache/daisy4nfv +DAISYCORE_TAG=1.3.0 + if [[ -d $tmp_rpm_build_dir ]]; then rm -fr $tmp_rpm_build_dir fi @@ -35,6 +37,13 @@ do echo -e "\n\n\n*** Starting build attempt # $cnt" git clone https://git.openstack.org/openstack/daisycloud-core + + if [[ ! -z "$DAISYCORE_TAG" ]]; then + pushd daisycloud-core + git checkout $DAISYCORE_TAG + popd + fi + cp $rpm_build_dir/code/makefile_patch.sh daisycloud-core/tools/setup cp $rpm_build_dir/code/install_interface_patch.sh daisycloud-core/tools/setup cd daisycloud-core/make |