summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/config.mk2
-rw-r--r--build/f_isoroot/f_repobuild/Makefile11
2 files changed, 7 insertions, 6 deletions
diff --git a/build/config.mk b/build/config.mk
index dcffe40f1..e11d033e1 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -22,7 +22,7 @@ export FUEL_NAILGUN_AGENT_COMMIT=b2bb466fd5bd92da614cdbd819d6999c510ebfb1
export ASTUTE_COMMIT=b81577a5b7857c4be8748492bae1dec2fa89b446
export OSTF_COMMIT=3bc76a63a9e7d195ff34eadc29552f4235fa6c52
export FUEL_MIRROR_COMMIT=fb45b80d7bee5899d931f926e5c9512e2b442749
-export FUELMENU_COMMIT=e071216cb214e34b4d861478033425ee6a54a3be
+export FUELMENU_COMMIT=78ffc73065a9674b707c081d128cb7eea611474f
export SHOTGUN_COMMIT=63645dea384a37dde5c01d4f8905566978e5d906
export NETWORKCHECKER_COMMIT=a43cf96cd9532f10794dce736350bf5bed350e9d
export FUELUPGRADE_COMMIT=616a7490ec7199f69759e97e42f9b97dfc87e85b
diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
index 455caf263..e95dbf2ef 100644
--- a/build/f_isoroot/f_repobuild/Makefile
+++ b/build/f_isoroot/f_repobuild/Makefile
@@ -10,8 +10,7 @@
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_COMMIT?=$(FUEL_MAIN_TAG)
@@ -36,9 +35,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)