diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-12-06 12:58:55 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-12-08 21:52:32 -0500 |
| commit | 58a098e08ec131338b0c29b902472c54b2a26168 (patch) | |
| tree | 8fb5727e1511d1114cd5b60f0659d624105b4542 /build/overcloud-onos.sh | |
| parent | 9131b0a81c22e713b4d4798d7ff32254be3b99e3 (diff) | |
Fixes and cleans up build/cache directory usage
Changes include:
- Building is isolated to a .build directory that is git ignored
- Caching is isolated to a .cache directory that is git ignored
- Build scripts have been variablized, and relative paths have been
removed
- Unused files removed
- build.sh, make file cleaned up
- Fixed broken building of markupsafe and jinja2 packages
- make clean-cache will remove the cache now
- per item cleans are removed in place of simple clean .build now
- includes fix for OSC issue with LP# 1642301
Change-Id: I42b8e4eb694bf0a2c398858814f8b73785931896
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/overcloud-onos.sh')
| -rwxr-xr-x | build/overcloud-onos.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh index 921ad506..c00cee7b 100755 --- a/build/overcloud-onos.sh +++ b/build/overcloud-onos.sh @@ -11,7 +11,7 @@ set -e source ./cache.sh source ./variables.sh -pushd images > /dev/null +pushd ${BUILD_DIR} > /dev/null cp -f overcloud-full.qcow2 overcloud-full-onos_build.qcow2 ####################################### @@ -23,7 +23,7 @@ rm -rf puppet-onos populate_cache "$onos_release_uri/$onos_release_file" "$(curl https://downloads.onosproject.org/nightly/ | grep $onos_release_file | grep -o -e '[0-9a-f]\{32\}')" populate_cache "$onos_jdk_uri/jdk-8u51-linux-x64.tar.gz" -LIBGUESTFS_BACKEND=direct virt-customize --upload $CACHE_DIR/$onos_release_file:/opt/ \ +LIBGUESTFS_BACKEND=direct virt-customize --upload ${CACHE_DIR}/${onos_release_file}:/opt/ \ --run-command "mkdir /opt/onos && cd /opt/ && tar -xzf $onos_release_file -C /opt/onos --strip-components=1" \ -a overcloud-full-onos_build.qcow2 @@ -31,10 +31,10 @@ LIBGUESTFS_BACKEND=direct virt-customize --upload $CACHE_DIR/$onos_release_file: git clone https://github.com/bobzhouHW/puppet-onos.git tar --xform="s:puppet-onos/:onos/:" -czf puppet-onos.tar.gz puppet-onos -LIBGUESTFS_BACKEND=direct virt-customize --upload $CACHE_DIR/jdk-8u51-linux-x64.tar.gz:/opt/ \ - --upload puppet-onos/files/install_jdk8.tar:/opt/ \ +LIBGUESTFS_BACKEND=direct virt-customize --upload ${CACHE_DIR}/jdk-8u51-linux-x64.tar.gz:/opt/ \ + --upload ${BUILD_DIR}/puppet-onos/files/install_jdk8.tar:/opt/ \ --run-command "cd /opt/ && tar -xf install_jdk8.tar && sh /opt/install_jdk8/install_jdk8.sh" \ - --upload puppet-onos.tar.gz:/etc/puppet/modules/ \ + --upload ${BUILD_DIR}/puppet-onos.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-onos.tar.gz" \ -a overcloud-full-onos_build.qcow2 |