diff options
| author |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-03-22 23:04:43 +0100 |
|---|---|---|
| committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-03-26 17:26:27 +0100 |
| commit | 2de197be04b871b437e35b55ca7f48d921595303 (patch) | |
| tree | b2f812d507ac3037153c11a5f19ea6db5c27009e /fuel/build/f_odl_docker/Makefile | |
| parent | a5a094a199226f312e795c3019c5793094e5378e (diff) | |
Fuel build cache handling
- Cache invalidation supported in case cache is outdated compared to upstream.
- Fully automated build.sh integration tests added (build.sh -t or build.sh -T)
- Rebased to Daniel Smiths's patch-set: genesis refs/changes/71/171/4
- Yet untested, will perform automated integration tests over night!
- Updated based on Stefan's comments (no more revs.)
- Fixed a bug in f_odl_docker/Makefile
- validate-cache target added in f_odl_docker/Makefile
JIRA: BGS-1
Change-Id: I9f8f30c2a85fd7bf04dab1b566065e5739d4fcb1
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Diffstat (limited to 'fuel/build/f_odl_docker/Makefile')
| -rwxr-xr-x | fuel/build/f_odl_docker/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fuel/build/f_odl_docker/Makefile b/fuel/build/f_odl_docker/Makefile index b227bee..6135e71 100755 --- a/fuel/build/f_odl_docker/Makefile +++ b/fuel/build/f_odl_docker/Makefile @@ -12,7 +12,7 @@ TOP := $(shell pwd) BUILDTAG := loving_daniel # Edit this to match the GENESIS / OPNFV in your environment -export OPNFV_PUPPET := /home/lmcdasm/MAR24/genesis/common/puppet-opnfv +export OPNFV_PUPPET := $(BUILD_BASE)/../../common/puppet-opnfv include ../config.mk .PHONY: all @@ -25,7 +25,7 @@ all: @docker save ${BUILDTAG} > puppet/modules/opnfv/odl_docker/odl_docker_image.tar @wget ${DOCKER_REPO}/${DOCKER_TAG} -O puppet/modules/opnfv/odl_docker/docker-latest @echo "OPFNV_PUPPET is: ${OPNFV_PUPPET}" - @cp -Rvp ${OPNFV_PUPPET}/manifests/templates/dockerfile/compute_scripts puppet/modules/opnfv + @cp -Rvp ${OPNFV_PUPPET}/manifests/templates/dockerfile/container_scripts puppet/modules/opnfv .PHONY: clean clean: @@ -39,9 +39,13 @@ build-clean: @rm -rf puppet/modules/opnfv/odl_docker/odl_docker_image.tar @rm -rf puppet/modules/opnfv/odl_docker/docker-latest +.PHONY: validate-cache +validate-cache: + @echo "No cache validation schema available for $(shell pwd)" + @echo "Continuing ..." .PHONY: release release: # Fetch PP from OPNFV Common - @cp -Rvp ${OPNFV_PUPPET}/common/puppet-opnfv/manifests/odl_docker.pp ${PUPPET_DEST} + @cp -Rvp ${OPNFV_PUPPET}/manifests/odl_docker.pp ${PUPPET_DEST} @cp -Rvp puppet/modules/* $(PUPPET_DEST) |