diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2015-09-26 01:05:16 +0200 |
|---|---|---|
| committer | Stefan Berg <stefan.k.berg@ericsson.com> | 2015-09-26 08:13:31 +0000 |
| commit | d01e1866e89fb428099880aea73a8fdbe5749e64 (patch) | |
| tree | 412e57244e3688277d25e8edd393131154f4d4cd /fuel/build | |
| parent | 7ebcd36ad54157e0107252ab6c41dc15a509ab21 (diff) | |
Correction of Fuel cache building
The cache was previously not fully populated.
Change-Id: I77885bc1fa0e9cbc7499e2dc4ceee47ff3b2e14c
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
(cherry picked from commit d8d4303b2cea8dca0ce67407b6a60145dbfe111c)
Diffstat (limited to 'fuel/build')
| -rw-r--r-- | fuel/build/f_isoroot/f_repobuild/Makefile | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/fuel/build/f_isoroot/f_repobuild/Makefile b/fuel/build/f_isoroot/f_repobuild/Makefile index ee0e819..b8f0aa2 100644 --- a/fuel/build/f_isoroot/f_repobuild/Makefile +++ b/fuel/build/f_isoroot/f_repobuild/Makefile @@ -15,11 +15,10 @@ DOCKVERSION = 1.0 .PHONY: all all: .nailgun -.fuel-createmirror: - sudo apt-get install -y rsync python dpkg-dev fakeroot openssl - sudo ln -s `pwd` /var/www - sudo mkdir /var/log/mirror-sync - sudo chmod 777 /var/log/mirror-sync +.nailgun: + sudo apt-get update + sudo apt-get upgrade -y + sudo apt-get install -y rsync python python-yaml dpkg-dev openssl rm -rf tmpiso tmpdir mkdir tmpiso fuseiso ${ISOCACHE} tmpiso @@ -27,9 +26,12 @@ all: .nailgun fusermount -u tmpiso rm -rf tmpiso sudo dpkg -i fuel-createmirror_6.1*.deb - sudo sed -i 's/DOCKER_MODE=true/DOCKER_MODE=false/' /etc/fuel-createmirror/common.cfg - touch .fuel-createmirror - + rm -Rf nailgun + sudo mkdir -p /var/www + sudo su - -c /opt/fuel-createmirror-6.1/fuel-createmirror + sudo chmod -R 755 /var/www/nailgun + cp -Rp /var/www/nailgun . + touch .nailgun .PHONY: clean clean: @@ -42,9 +44,3 @@ release:.nailgun @mkdir -p ../release/opnfv @cp -Rp nailgun ../release/opnfv/nailgun -.nailgun: .fuel-createmirror - rm -Rf nailgun - fakeroot /opt/fuel-createmirror-6.1/fuel-createmirror - # Bug fix for https://bugs.launchpad.net/fuel/+bug/1476593 - find nailgun/mos-ubuntu -type d -exec chmod 755 {} \; - touch .nailgun |