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/0044-build-cache-Allow-LOCAL_CACHE_ARCH_NAME-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/0044-build-cache-Allow-LOCAL_CACHE_ARCH_NAME-override.patch')
-rw-r--r-- | patches/opnfv-fuel/0044-build-cache-Allow-LOCAL_CACHE_ARCH_NAME-override.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0044-build-cache-Allow-LOCAL_CACHE_ARCH_NAME-override.patch b/patches/opnfv-fuel/0044-build-cache-Allow-LOCAL_CACHE_ARCH_NAME-override.patch new file mode 100644 index 00000000..e477421d --- /dev/null +++ b/patches/opnfv-fuel/0044-build-cache-Allow-LOCAL_CACHE_ARCH_NAME-override.patch @@ -0,0 +1,22 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Thu, 18 Aug 2016 14:39:08 +0200 +Subject: [PATCH] build: cache: Allow LOCAL_CACHE_ARCH_NAME override + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + ci/build.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ci/build.sh b/ci/build.sh +index 62abba1..82049cd 100755 +--- a/ci/build.sh ++++ b/ci/build.sh +@@ -111,7 +111,7 @@ SCRIPT_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]})) + BUILD_BASE=$(readlink -e ${SCRIPT_DIR}/../build/) + RESULT_DIR="${BUILD_BASE}/release" + BUILD_SPEC="${BUILD_BASE}/config.mk" +-LOCAL_CACHE_ARCH_NAME="fuel-cache" ++LOCAL_CACHE_ARCH_NAME="${LOCAL_CACHE_ARCH_NAME:-fuel-cache}" + + # + # END of variables to customize |