summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-08 12:52:25 +0000
committerGerrit Code Review <review@openstack.org>2016-09-08 12:52:25 +0000
commita143f1856e1d0869178a7fbd3b8507c0207b33b5 (patch)
tree9a41baa9d3b808b4f08b423042dd83deacc7926a
parent542f98cfebf6bf2c665d07827761ad48da647699 (diff)
parent3102e7fc292064b1dccea875fb6cc4e0aaf8d459 (diff)
Merge "Allow to pass RPM repos to build-sandbox"
-rw-r--r--config.mk4
-rw-r--r--sandbox.mk13
2 files changed, 17 insertions, 0 deletions
diff --git a/config.mk b/config.mk
index 1473614..5f610da 100644
--- a/config.mk
+++ b/config.mk
@@ -167,6 +167,10 @@ MIRROR_FUEL?=http://mirror.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PROD
167# Example: EXTRA_RPM_REPOS="lolo,http://my.cool.repo/rpm,priority bar,ftp://repo.foo,priority" 167# Example: EXTRA_RPM_REPOS="lolo,http://my.cool.repo/rpm,priority bar,ftp://repo.foo,priority"
168EXTRA_RPM_REPOS?= 168EXTRA_RPM_REPOS?=
169 169
170# define RPM repo which contains fuel rpm-build-dep packages, in format
171# EXTRA_RPM_BUILDDEP_REPO=http://my.cool.repo/rpm
172EXTRA_RPM_BUILDDEP_REPO?=
173
170comma:=, 174comma:=,
171 175
172# Path to yaml configuration file to build ISO ks.cfg 176# Path to yaml configuration file to build ISO ks.cfg
diff --git a/sandbox.mk b/sandbox.mk
index 0c386c3..9d34dc9 100644
--- a/sandbox.mk
+++ b/sandbox.mk
@@ -42,6 +42,16 @@ gpgcheck=0
42priority=3 42priority=3
43endef 43endef
44 44
45ifdef EXTRA_RPM_BUILDDEP_REPO
46define yum_extra_build_repo
47[extra_build]
48name=Extra Build
49baseurl=$(EXTRA_RPM_BUILDDEP_REPO)
50gpgcheck=0
51priority=2
52endef
53endif
54
45define sandbox_yum_conf 55define sandbox_yum_conf
46[main] 56[main]
47cachedir=/tmp/cache 57cachedir=/tmp/cache
@@ -121,6 +131,7 @@ $(yum_upstream_repo)
121$(yum_epel_repo) 131$(yum_epel_repo)
122$(yum_local_repo) 132$(yum_local_repo)
123$(yum_local_mos_repo) 133$(yum_local_mos_repo)
134$(yum_extra_build_repo)
124EOF 135EOF
125echo $(SANDBOX_PACKAGES) | xargs -n1 | xargs -I_package sudo sh -c 'rm -vf $(SANDBOX)/etc/yum.repos.d/Cent*; chroot $(SANDBOX) yum -y --nogpgcheck install _package' 136echo $(SANDBOX_PACKAGES) | xargs -n1 | xargs -I_package sudo sh -c 'rm -vf $(SANDBOX)/etc/yum.repos.d/Cent*; chroot $(SANDBOX) yum -y --nogpgcheck install _package'
126# clean all repos except the MOS + upsream + our epel 137# clean all repos except the MOS + upsream + our epel
@@ -247,9 +258,11 @@ show-centos-sandbox-repos: export yum_upstream_repo_content:=$(yum_upstream_repo
247show-centos-sandbox-repos: export yum_epel_repo_content:=$(yum_epel_repo) 258show-centos-sandbox-repos: export yum_epel_repo_content:=$(yum_epel_repo)
248show-centos-sandbox-repos: export yum_local_repo_content:=$(yum_local_repo) 259show-centos-sandbox-repos: export yum_local_repo_content:=$(yum_local_repo)
249show-centos-sandbox-repos: export yum_local_mos_repo_content:=$(yum_local_mos_repo) 260show-centos-sandbox-repos: export yum_local_mos_repo_content:=$(yum_local_mos_repo)
261show-centos-sandbox-repos: export yum_extra_build_repo_content:=$(yum_extra_build_repo)
250show-centos-sandbox-repos: 262show-centos-sandbox-repos:
251 /bin/echo -e "$${sandbox_yum_conf_content}\n" 263 /bin/echo -e "$${sandbox_yum_conf_content}\n"
252 /bin/echo -e "$${yum_upstream_repo_content}\n" 264 /bin/echo -e "$${yum_upstream_repo_content}\n"
253 /bin/echo -e "$${yum_epel_repo_content}\n" 265 /bin/echo -e "$${yum_epel_repo_content}\n"
254 /bin/echo -e "$${yum_local_repo_content}\n" 266 /bin/echo -e "$${yum_local_repo_content}\n"
255 /bin/echo -e "$${yum_local_mos_repo_content}\n" 267 /bin/echo -e "$${yum_local_mos_repo_content}\n"
268 /bin/echo -e "$${yum_extra_build_repo_content}\n"