X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel%2Fbuild%2Ff_isoroot%2Ff_repobuild%2FMakefile;h=6bfbd35c16a2c1118e411d18c89d059e71caa8d5;hb=563547b4a9f44090f32c0e17d040114854563760;hp=ee0e81974bf6d68626b479cc65f37c98afa211f5;hpb=99373ffa44102439c3006a78527443f36d75a378;p=genesis.git

diff --git a/fuel/build/f_isoroot/f_repobuild/Makefile b/fuel/build/f_isoroot/f_repobuild/Makefile
index ee0e819..6bfbd35 100644
--- a/fuel/build/f_isoroot/f_repobuild/Makefile
+++ b/fuel/build/f_isoroot/f_repobuild/Makefile
@@ -8,18 +8,24 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+SHELL := /bin/bash
 TOP := $(shell pwd)
 DOCKNAME = fuelrepo
 DOCKVERSION = 1.0
 
+# try to choose close ubuntu mirror which support rsync protocol
+# https://bugs.launchpad.net/fuel/+bug/1459252
+MIRROR_URLS := $(shell curl -s http://mirrors.ubuntu.com/mirrors.txt)
+MIRROR_HOSTS := $(shell for url in ${MIRROR_URLS}; do echo $$url | cut -d'/' -f3; done)
+RSYNC_HOST := $(shell for host in ${MIRROR_HOSTS}; do rsync -4 --contimeout 5 --no-motd --list-only "$${host}::ubuntu/." &> /dev/null && echo $$host && break; done)
+
 .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
@@ -28,8 +34,14 @@ all: .nailgun
 	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
-
+	sudo sed -i 's/DEBUG="no"/DEBUG="yes"/' /etc/fuel-createmirror/ubuntu.cfg
+	sudo sed -i 's/MIRROR_UBUNTU_HOST="archive.ubuntu.com"/MIRROR_UBUNTU_HOST="${RSYNC_HOST}"/' /etc/fuel-createmirror/common.cfg
+	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 +54,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