openstack/fuel-web
Code Issues Proposed changes

Settings for OSCI and OSTF teams

Browse Source
This commit is contained in:
Dmitry Pyzhov 2013-07-25 18:22:37 +04:00 committed by default
parent e9ca9fb0a1
commit 4704927467
6 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
config.mk
View File

@ -81,10 +81,32 @@ MIRROR_GEMS?=$(MIRROR_BASE)/gems
MIRROR_SRC?=$(MIRROR_BASE)/src
endif
#
# OSCI team requirement: build an iso with our srv08 mirror,
# but use their repo for fuel packages. This section is quick
# way to implement it.
# Limitation of the solution: osci repo will be mixed with srv08 mirror.
# If package is missed in osci repo - it will be taken from srv08.
# If package have the same version in osci and in srv08 repos - any copy
# of it will be taken randomly.
#
ifeq ($(USE_MIRROR),osci)
YUM_REPOS?=proprietary fuel
MIRROR_FUEL?=http://download.mirantis.com/epel-fuel-grizzly-3.1/
MIRROR_BASE?=http://srv08-srt.srt.mirantis.net/fwm/$(PRODUCT_VERSION)
MIRROR_CENTOS?=$(MIRROR_BASE)/centos
MIRROR_EGGS?=$(MIRROR_BASE)/eggs
MIRROR_GEMS?=$(MIRROR_BASE)/gems
MIRROR_SRC?=$(MIRROR_BASE)/src
endif
MIRROR_CENTOS?=http://mirror.yandex.ru/centos/$(CENTOS_RELEASE)
MIRROR_CENTOS_OS_BASEURL:=$(MIRROR_CENTOS)/os/$(CENTOS_ARCH)
MIRROR_RHEL?=http://srv11-msk.msk.mirantis.net/rhel6/rhel-6-server-rpms
MIRROR_RHEL_BOOT?=http://srv11-msk.msk.mirantis.net/rhel6/rhel-server-6.4-x86_64
# MIRROR_FUEL option is valid only for 'fuel' YUM_REPOS section
# and ignored in other cases
MIRROR_FUEL?=http://download.mirantis.com/epel-fuel-grizzly-3.1/
# It can be any a list of links (--find-links) or a pip index (--index-url).
MIRROR_EGGS?=http://pypi.python.org/simple
# NOTE(mihgen): removed gemcutter - it redirects to rubygems.org and has issues w/certificate now
@ -97,6 +119,11 @@ REQUIRED_SRCS:=$(shell grep -v ^\\s*\# $(SOURCE_DIR)/requirements-src.txt)
REQ_RHEL_RPMS:=$(shell grep -v "^\\s*\#" $(SOURCE_DIR)/fuel/deployment/puppet/rpmcache/files/required-rpms.txt)
REQ_FUEL_RHEL_RPMS:=$(shell grep -v "^\\s*\#" $(SOURCE_DIR)/fuel/deployment/puppet/rpmcache/files/req-fuel-rhel.txt)
OSTF_PLUGIN_SHA?=f35c42b0e4387d416c7387a5a5a1fa8aa22181af
OSTF_PLUGIN_VER?=0.2
OSTF_TESTS_SHA?=89fe1ac7a14ec2e038cd957ab763163de525624b
OSTF_TESTS_VER?=0.1
# Which repositories to use for making local centos mirror.
# Possible values you can find out from mirror/centos/yum_repos.mk file.
# The actual name will be constracted wich prepending "yum_repo_" prefix.

12
mirror/centos/yum_repos.mk
View File

@ -57,23 +57,15 @@ priority=10
endef
define yum_repo_fuel
[epel-fuel-grizzly-3.1]
[fuel]
name=Mirantis OpenStack Custom Packages
#mirrorlist=http://download.mirantis.com/epel-fuel-grizzly-3.1/mirror.internal.list
baseurl=http://download.mirantis.com/epel-fuel-grizzly-3.1/
baseurl=$(MIRROR_FUEL)
gpgcheck=0
enabled=1
priority=1
endef
define yum_repo_subscr_manager
[rh-subscr-manager]
name = RedHat subscription manager
baseurl=http://repos.fedorapeople.org/repos/candlepin/subscription-manager/epel-6Server/x86_64/
gpgcheck=0
enabled=1
endef
define yum_repo_proprietary
[proprietary]
name = RHEL $(CENTOS_RELEASE) - Proprietary

9
mirror/src/module.mk
View File

@ -6,6 +6,15 @@ else
wget --no-use-server-timestamps -c -P $(LOCAL_MIRROR_SRC) $(MIRROR_SRC)/$(notdir $@)
endif
#
# Download ostf packages directry from the github, because
# it updates often and we don't want to update main mirrors
# on each commit
#
$(BUILD_DIR)/mirror/src/build.done: $(call depv,OSTF_TESTS_SHA)
$(BUILD_DIR)/mirror/src/build.done: $(call depv,OSTF_PLUGIN_SHA)
$(BUILD_DIR)/mirror/src/build.done: $(SOURCE_DIR)/requirements-src.txt \
| $(addprefix $(LOCAL_MIRROR_SRC)/, $(notdir $(REQUIRED_SRCS)))
wget --no-use-server-timestamps -c -P $(LOCAL_MIRROR_SRC) https://github.com/Mirantis/fuel-ostf-tests/archive/$(OSTF_TESTS_SHA).zip
wget --no-use-server-timestamps -c -P $(LOCAL_MIRROR_SRC) https://github.com/Mirantis/fuel-ostf-plugin/archive/$(OSTF_PLUGIN_SHA).zip
$(ACTION.TOUCH)

6
packages/eggs/module.mk
View File

@ -15,7 +15,7 @@ define build_egg
$(BUILD_DIR)/packages/eggs/build.done: \
$(BUILD_DIR)/packages/eggs/$3-$4.tar.gz
$(BUILD_DIR)/packages/eggs/$3-$4.tar.gz:
$(BUILD_DIR)/packages/eggs/$3-$4.tar.gz: $(LOCAL_MIRROR_SRC)/$2.zip
mkdir -p $(BUILD_DIR)/packages/eggs
rm -rf $(BUILD_DIR)/packages/eggs/$1-$2
unzip -q $(LOCAL_MIRROR_SRC)/$2.zip -d $(BUILD_DIR)/packages/eggs
@ -23,8 +23,8 @@ $(BUILD_DIR)/packages/eggs/$3-$4.tar.gz:
cp $(BUILD_DIR)/packages/eggs/$1-$2/dist/$3-$4.tar.gz $(BUILD_DIR)/packages/eggs
endef
$(eval $(call build_egg,fuel-ostf-tests,ad8dfa0f97786b8ba8686bada9bdf74bc5d7eea2,ostf_tests,0.1))
$(eval $(call build_egg,fuel-ostf-plugin,29baaccbcb1ab63f70f324ceb780739ea112ac2e,testing_adapter,0.2))
$(eval $(call build_egg,fuel-ostf-tests,$(OSTF_TESTS_SHA),ostf_tests,$(OSTF_TESTS_VER)))
$(eval $(call build_egg,fuel-ostf-plugin,$(OSTF_PLUGIN_SHA),testing_adapter,$(OSTF_PLUGIN_VER)))
$(eval $(call build_egg,GateOne,bb003114b4e84e9425fd02fd1ee615d4dd2113e7,gateone,1.2.0))
nailgun: $(BUILD_DIR)/packages/eggs/Nailgun-$(NAILGUN_VERSION).tar.gz

2
requirements-rpm.txt
View File

@ -122,7 +122,7 @@ screen-4.0.3-16.el6
selinux-policy-3.7.19-195.el6_4.12
selinux-policy-targeted-3.7.19-195.el6_4.12
socat-1.7.2.1-1.el6
subscription-manager-1.8.9-1.el6
subscription-manager-1.1.23.1-1.el6
supervisor-3.0a12-0.12.el6
syslinux-4.02-8.el6
system-config-firewall-base-1.2.27-5.el6

2
requirements-src.txt
View File

@ -7,5 +7,3 @@ https://github.com/sstephenson/ruby-build/archive/1fb955eead087646f4d73ac3678643
http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz
http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p392.tar.gz
https://github.com/liftoff/GateOne/archive/bb003114b4e84e9425fd02fd1ee615d4dd2113e7.zip
https://github.com/Mirantis/fuel-ostf-tests/archive/ad8dfa0f97786b8ba8686bada9bdf74bc5d7eea2.zip
https://github.com/Mirantis/fuel-ostf-plugin/archive/29baaccbcb1ab63f70f324ceb780739ea112ac2e.zip