diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-03-23 02:05:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-23 02:05:41 +0000 |
| commit | 841d020c77f1d9aac5f66f3320444c83b31ef07a (patch) | |
| tree | e64f4a8e0ccd60962429fc7f741c4cf644b2a67f | |
| parent | 19951f6c2bbfc3d4c9a87a7b1039fe7bc9116d38 (diff) | |
| parent | de048af950288b6615dfe175e676a753cd9d3f80 (diff) | |
Merge "abolish tag to use branch to get daisy from upstream"
| -rwxr-xr-x | ci/build_rpm/build_rpms_docker.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh index 55b2e164..caeb005b 100755 --- a/ci/build_rpm/build_rpms_docker.sh +++ b/ci/build_rpm/build_rpms_docker.sh @@ -14,7 +14,7 @@ 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 +DAISYCORE_TAG= if [[ -d $tmp_rpm_build_dir ]]; then rm -fr $tmp_rpm_build_dir @@ -41,7 +41,6 @@ do if [[ ! -z "$DAISYCORE_TAG" ]]; then pushd daisycloud-core git checkout $DAISYCORE_TAG - git fetch https://git.openstack.org/openstack/daisycloud-core refs/changes/91/441791/1 && git cherry-pick FETCH_HEAD popd fi |