openstack
/
fuel-main
Code Issues Proposed changes

Merge "Untie PRODUCT_VERSION from PACKAGE_VERSION"

This commit is contained in:
Jenkins 2016-01-18 09:32:54 +00:00 committed by Gerrit Code Review
parent d7193fd75f bac8172c13
commit a8d66d6867
5 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
config.mk
View File

@ -19,7 +19,7 @@ LOCAL_MIRROR:=$(abspath $(LOCAL_MIRROR))
DEPS_DIR?=$(TOP_DIR)/deps
DEPS_DIR:=$(abspath $(DEPS_DIR))
PRODUCT_VERSION:=9.0
PRODUCT_VERSION?=9.0
# This variable is used for naming of auxillary objects
# related to product: repositories, mirrors etc
@ -33,7 +33,8 @@ PRODUCT_NAME:=mos
# to come from DEPS_DIR "as is"
CURRENT_VERSION:=$(PRODUCT_VERSION)
PACKAGE_VERSION=$(PRODUCT_VERSION).0
PACKAGE_VERSION?=9.0.0
FUEL_LIBRARY_VERSION?=9.0
# Path to pre-built artifacts
DEPS_DIR_CURRENT?=$(DEPS_DIR)/$(CURRENT_VERSION)
@ -227,7 +228,7 @@ MIRROR_DOCKER?=http://mirror.fuel-infra.org/docker/$(PRODUCT_VERSION)
# MIRROR_FUEL affects build process only if YUM_REPOS variable contains 'fuel'.
# Otherwise it is ignored entirely.
MIRROR_FUEL?=http://mirror.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel/os.target.txt
MIRROR_FUEL?=http://mirror.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel
# Additional CentOS repos.
# Each repo must be comma separated tuple with repo-name and repo-path.
@ -268,13 +269,3 @@ SANDBOX_COPY_CERTS?=0
# \apt/metadata.json
# \concat/metadata.json
USE_PREDEFINED_FUEL_LIB_PUPPET_MODULES?=
# If the URL given ended with target.txt then is't a pointer to a snapshot that
# should be unlinked. If it is not - return it as is.
expand_repo_url=$(shell url=$1; echo $${url} | grep -q -e '.*\.target\.txt$$' && echo "$${url%/*}/$$(curl -sSf $$url | head -1)/x86_64/" || echo $${url})
# Expand repo URLs now
#MIRROR_CENTOS:=$(call expand_repo_url,$(MIRROR_CENTOS))
#MIRROR_CENTOS_KERNEL:=$(call expand_repo_url,$(MIRROR_CENTOS_KERNEL))
#SANDBOX_MIRROR_CENTOS_UPSTREAM:=$(call expand_repo_url,$(SANDBOX_MIRROR_CENTOS_UPSTREAM))
MIRROR_FUEL:=$(call expand_repo_url,$(MIRROR_FUEL))

2
packages/deb/module.mk
View File

@ -75,7 +75,7 @@ $(BUILD_DIR)/packages/deb/build.done:
fuel_debian_packages:=fuel-nailgun \
astute \
fuel-agent \
fuel-library$(PRODUCT_VERSION) \
fuel-library$(FUEL_LIBRARY_VERSION) \
fuel-mirror \
fuel-nailgun-agent \
network-checker

12
packages/module.mk
View File

@ -45,13 +45,13 @@ endef
# fuel-library offline build hook
ifneq ($(USE_PREDEFINED_FUEL_LIB_PUPPET_MODULES),)
$(BUILD_DIR)/packages/sources/fuel-library$(PRODUCT_VERSION)/upstream_modules.tar.gz:
$(BUILD_DIR)/packages/sources/fuel-library$(FUEL_LIBRARY_VERSION)/upstream_modules.tar.gz:
@mkdir -p $(@D)
wget -nv $(USE_PREDEFINED_FUEL_LIB_PUPPET_MODULES) -O $@.tmp
mv $@.tmp $@
$(BUILD_DIR)/packages/source_fuel-library$(PRODUCT_VERSION).done: \
$(BUILD_DIR)/packages/sources/fuel-library$(PRODUCT_VERSION)/upstream_modules.tar.gz
$(BUILD_DIR)/packages/source_fuel-library$(FUEL_LIBRARY_VERSION).done: \
$(BUILD_DIR)/packages/sources/fuel-library$(FUEL_LIBRARY_VERSION)/upstream_modules.tar.gz
endif
$(BUILD_DIR)/packages/source_%.done:
@ -64,7 +64,7 @@ $(eval $(call prepare_git_source,fuel-ostf,fuel-ostf-$(PACKAGE_VERSION).tar.gz,$
#ASTUTE_PKGS
$(eval $(call prepare_git_source,astute,astute-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/astute,HEAD,$(ASTUTE_GERRIT_COMMIT)))
#FUELLIB_PKGS
$(eval $(call prepare_git_source,fuel-library$(PRODUCT_VERSION),fuel-library$(PRODUCT_VERSION)-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-library$(PRODUCT_VERSION),HEAD,$(FUELLIB_GERRIT_COMMIT)))
$(eval $(call prepare_git_source,fuel-library$(FUEL_LIBRARY_VERSION),fuel-library$(FUEL_LIBRARY_VERSION)-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-library$(FUEL_LIBRARY_VERSION),HEAD,$(FUELLIB_GERRIT_COMMIT)))
#FUEL_PYTHON_PKGS
$(eval $(call prepare_git_source,python-fuelclient,python-fuelclient-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/python-fuelclient,HEAD,$(PYTHON_FUELCLIENT_GERRIT_COMMIT)))
#FUEL_AGENT_PKGS
@ -100,10 +100,6 @@ packages: $(BUILD_DIR)/packages/build.done
packages-rpm: $(BUILD_DIR)/packages/rpm/build.done
packages-deb: $(BUILD_DIR)/packages/deb/build.done
#FIXME(aglarendil): make sources generation uniform
#$(BUILD_DIR)/packages/source_fuel-library.done: $(BUILD_DIR)/packages/source_fuel-library$(PRODUCT_VERSION).done
# ln -s $(BUILD_DIR)/packages/sources/fuel-library$(PRODUCT_VERSION) $(BUILD_DIR)/packages/sources/fuel-library
# $(ACTION.TOUCH)
###################################
#### LATE PACKAGES ################

2
packages/rpm/module.mk
View File

@ -83,7 +83,7 @@ endef
packages_list:=\
astute \
fuel-agent \
fuel-library$(PRODUCT_VERSION) \
fuel-library$(FUEL_LIBRARY_VERSION) \
fuel-main \
fuelmenu \
fuel-mirror \

6
repos.mk
View File

@ -45,12 +45,12 @@ $(eval $(call build_repo,fuel-upgrade,$(FUELUPGRADE_REPO),$(FUELUPGRADE_COMMIT),
$(BUILD_DIR)/repos/fuel-main.done:
ln -s $(SOURCE_DIR) $(BUILD_DIR)/repos/fuel-main
$(ACTION.TOUCH)
$(BUILD_DIR)/repos/repos.done: $(BUILD_DIR)/repos/fuel-main.done $(BUILD_DIR)/repos/fuel-library$(PRODUCT_VERSION).done
$(BUILD_DIR)/repos/repos.done: $(BUILD_DIR)/repos/fuel-main.done $(BUILD_DIR)/repos/fuel-library$(FUEL_LIBRARY_VERSION).done
#FIXME(aglarendil): make repos generation uniform
$(BUILD_DIR)/repos/fuel-library$(PRODUCT_VERSION).done: $(BUILD_DIR)/repos/fuel-library.done
ln -s $(BUILD_DIR)/repos/fuel-library $(BUILD_DIR)/repos/fuel-library$(PRODUCT_VERSION)
$(BUILD_DIR)/repos/fuel-library$(FUEL_LIBRARY_VERSION).done: $(BUILD_DIR)/repos/fuel-library.done
ln -s $(BUILD_DIR)/repos/fuel-library $(BUILD_DIR)/repos/fuel-library$(FUEL_LIBRARY_VERSION)
$(ACTION.TOUCH)
$(BUILD_DIR)/repos/repos.done: