Merge changes from topic 'remote-libvirt-support'

[fuel.git] / build / f_isoroot / f_repobuild / Makefile

diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
index 455caf2..4bb04ca 100644 (file)
--- a/build/f_isoroot/f_repobuild/Makefile
+++ b/build/f_isoroot/f_repobuild/Makefile
@@ -10,9 +10,9 @@
 
 SHELL := /bin/bash
 TOP := $(shell pwd)
-UBUNTU_DIR := $(shell dirname $(MIRROR_UBUNTU_ROOT))
-TMP_ROOT_DIR := $(shell echo "$(UBUNTU_DIR)" | cut -d "/" -f2)
+TMP_ROOT_DIR := $(shell echo "$(MIRROR_UBUNTU_ROOT)" | cut -d "/" -f2)
 # Enable use of exact repo commit if defined, else use Fuel main branch
+FUEL_MIRROR_REPO?=https://github.com/openstack/fuel-mirror
 FUEL_MIRROR_COMMIT?=$(FUEL_MAIN_TAG)
 
 include ../../config.mk
@@ -27,7 +27,7 @@ nailgun:
        sudo apt-get install -y git libxml2-dev libxslt-dev python-dev  python-pip libz-dev libyaml-dev createrepo python-yaml
        rm -Rf nailgun
        sudo mkdir -p /var/www/nailgun
-       git clone https://github.com/openstack/fuel-mirror
+       git clone $(FUEL_MIRROR_REPO)
        cd fuel-mirror && git checkout -q $(FUEL_MIRROR_COMMIT)
        sudo pip install -U -r ./fuel-mirror/requirements.txt
        sudo pip install ./fuel-mirror
@@ -36,9 +36,11 @@ nailgun:
        sudo fuel-mirror --debug --config ./opnfv-config.yaml create --group ubuntu --pattern=ubuntu
        sudo chmod -R 755 /var/www/nailgun
        cp -Rp /var/www/nailgun .
-       if [ "$(UBUNTU_DIR)" != "/" ]; then \
-         mv nailgun/mirrors$(UBUNTU_DIR)/ubuntu nailgun/mirrors/ubuntu;\
-         rm -rf nailgun/mirrors/$(TMP_ROOT_DIR);\
+       # On the end we want to have ubuntu repository in mirrors/ubuntu directory
+       -if [ "$(MIRROR_UBUNTU_ROOT)" != "/ubuntu/" ]; then \
+         mkdir -p nailgun/mirrors/ubuntu;\
+         mv nailgun/mirrors$(MIRROR_UBUNTU_ROOT)* nailgun/mirrors/ubuntu;\
+         [ "$(MIRROR_UBUNTU_ROOT)" != "/" ] && rm -rf nailgun/mirrors/$(TMP_ROOT_DIR);\
        fi
        # Store artifact in cache straight away if caching is enabled
        # (no .cacheid will be present unless this is a cached build)
@@ -46,7 +48,7 @@ nailgun:
 
 .PHONY: clean
 clean:
-       @rm -rf ../release/opnfv/nailgun nailgun fuel-mirror
+       @rm -rf ../release/opnfv/nailgun nailgun fuel-mirror opnfv-config.yaml ubuntu.yaml
 
 .PHONY: release
 release:nailgun