diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-09 18:40:22 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-19 17:26:48 +0200 |
| commit | ec307077e542fd290701a871fedc7f58db37712c (patch) | |
| tree | 2be475e78a5b3493f70463d6f48147bbb46814e6 /patches/opnfv-fuel/0042-build-Allow-MIRROR_MOS_UBUNTU-override.patch | |
| parent | b340f0cbf6841133288178ed764baa93f93ac3fc (diff) | |
build: ISO refactor, use docker, enable cache
Previously, Armband Makefile used to call Fuel@OPNFV Makefile
target <iso>, instead of <all>, which resulted in bypassing
using Docker for ISO building completely.
Switch to <all> Makefile target, hence bringing back Docker
as a build container.
This change justifies moving make variables to a separate spec
file, armband.mk.
While at it, enable caching of builds.
This requires Jenkins bash scripts to be updated for the ISO
build job, done in [1].
JIRA: ARMBAND-56
[1] https://gerrit.opnfv.org/gerrit/#/c/18453/
CHANGES:
- all: release (was all: build)
- Common make targets now depend on submodules-init;
- clean-build and clean-docker make targets have been replaced by:
make clean, make deepclean;
FIXME: These issues should be fixed later:
- (optional) trim local repo paths from gitinfo files
- only account for armband submodules in cache fingerprints;
- identify size mismatch culprit
Change-Id: I7d73409be44983fa21d4c09d2e07b87a33231e03
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0042-build-Allow-MIRROR_MOS_UBUNTU-override.patch')
| -rw-r--r-- | patches/opnfv-fuel/0042-build-Allow-MIRROR_MOS_UBUNTU-override.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0042-build-Allow-MIRROR_MOS_UBUNTU-override.patch b/patches/opnfv-fuel/0042-build-Allow-MIRROR_MOS_UBUNTU-override.patch new file mode 100644 index 00000000..37e4d078 --- /dev/null +++ b/patches/opnfv-fuel/0042-build-Allow-MIRROR_MOS_UBUNTU-override.patch @@ -0,0 +1,22 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Tue, 16 Aug 2016 18:45:10 +0200 +Subject: [PATCH] build: Allow MIRROR_MOS_UBUNTU override + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + build/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/Makefile b/build/Makefile +index 4a4bb2e..6e18ddd 100644 +--- a/build/Makefile ++++ b/build/Makefile +@@ -60,7 +60,7 @@ export MIRROR_UBUNTU_ROOT := $(shell echo -n '/' ; echo "$(MIRROR_UBUNTU_URL)" | + + export LATEST_MIRROR_ID_URL := http://$(shell ./select_closest_fuel_mirror.py) + +-export MIRROR_MOS_UBUNTU := $(shell echo "$(LATEST_MIRROR_ID_URL)" | cut -d'/' -f3) ++export MIRROR_MOS_UBUNTU ?= $(shell echo "$(LATEST_MIRROR_ID_URL)" | cut -d'/' -f3) + export LATEST_TARGET_UBUNTU := $(shell curl -sSf "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/$(MOSVERSION).target.txt" | head -1) + export MIRROR_MOS_UBUNTU_ROOT := /mos-repos/ubuntu/$(LATEST_TARGET_UBUNTU) + |