diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-25 20:59:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-25 20:59:44 +0000 |
| commit | ec26aaa98dfc2e56a6e32729efe22e6b7ac99205 (patch) | |
| tree | 9a353abd9e890565f213ac8bee98bcb65a6ee9f9 | |
| parent | d9c86c5b1cb3f4641ea29f7671dd3050556b5773 (diff) | |
| parent | 020ea1f99635ca2510641a71412ac8dacdffc331 (diff) | |
Merge "fpb: Temporary fix for supporting multiple DEB ver" into stable/colorado
| -rw-r--r-- | patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch | 7 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch | 50 |
2 files changed, 56 insertions, 1 deletions
diff --git a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch index 7880fdfe..df1bd110 100644 --- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch +++ b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch @@ -51,7 +51,7 @@ new file mode 100644 index 0000000..1e772f0 --- /dev/null +++ b/build/armband.mk -@@ -0,0 +1,49 @@ +@@ -0,0 +1,54 @@ +############################################################################## +# Copyright (c) 2016 Enea AB and others. +# Alexandru.Avadanii@enea.com @@ -70,6 +70,11 @@ index 0000000..1e772f0 + export MIRROR_MOS_UBUNTU := linux.enea.com + export EXTRA_RPM_REPOS := armband,http://linux.enea.com/mos-repos/centos/mos9.0-centos7/armband/x86_64,10 + ++ # Temporary fuel-plugin-builder repo info for runtime patching ++ export FPB_REPO := https://github.com/openstack/fuel-plugins ++ export FPB_BRANCH := master ++ export FPB_CHANGE := refs/changes/31/311031/2 ++ + # Armband git submodules for Fuel/OPNFV components + export ASTUTE_REPO := ${ARMBAND_BASE}/upstream/fuel-astute + export ASTUTE_COMMIT := HEAD diff --git a/patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch b/patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch new file mode 100644 index 00000000..c13af1e2 --- /dev/null +++ b/patches/opnfv-fuel/0048-fpb-Support-multiple-versions-of-packages.patch @@ -0,0 +1,50 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Tue, 23 Aug 2016 15:48:56 +0200 +Subject: [PATCH] fpb: Support multiple versions of packages + +This is a temporary change until the fpm installed by pip gets +the change from [1] included. + +[1] https://review.openstack.org/#/c/311031/ + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + build/docker/Dockerfile | 9 ++++++++- + build/docker/Makefile | 4 ++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile +index 624f233..ab0d0d3 100644 +--- a/build/docker/Dockerfile ++++ b/build/docker/Dockerfile +@@ -23,7 +23,14 @@ RUN apt-get install -y software-properties-common python-software-properties \ + build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev + + RUN gem install fpm +-RUN pip install fuel-plugin-builder ++ ++# Temporary: fpb needs to be built from sources ++# RUN pip install fuel-plugin-builder ++RUN git clone -b INSERT_FPB_BRANCH INSERT_FPB_REPO && cd fuel-plugins && \ ++ (test -z INSERT_FPB_CHANGE || \ ++ (git fetch origin INSERT_FPB_CHANGE && git checkout FETCH_HEAD)) && \ ++ python setup.py sdist && pip install ./dist/fuel-plugin-builder-*.tar.gz && \ ++ cd .. && rm -rf fuel-plugins + + RUN echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/open-sudo + RUN echo "Defaults env_keep += \"ftp_proxy http_proxy https_proxy no_proxy RSYNC_PROXY RSYNC_CONNECT_PROG npm_config_registry\"" > /etc/sudoers.d/keep-proxies +diff --git a/build/docker/Makefile b/build/docker/Makefile +index d4423b0..226bbd0 100644 +--- a/build/docker/Makefile ++++ b/build/docker/Makefile +@@ -25,6 +25,10 @@ all: .docker + + .docker: $(FILES) + cp Dockerfile ubuntu-builder/Dockerfile ++ # Only add FPB ENVs when set - needed to fetch, patch and install FPB ++ test -n "${FPB_REPO}" && sed -i "s;INSERT_FPB_REPO;${FPB_REPO};" ubuntu-builder/Dockerfile || exit 0 ++ test -n "${FPB_BRANCH}" && sed -i "s;INSERT_FPB_BRANCH;${FPB_BRANCH};" ubuntu-builder/Dockerfile || exit 0 ++ test -n "${FPB_CHANGE}" && sed -i "s;INSERT_FPB_CHANGE;${FPB_CHANGE};" ubuntu-builder/Dockerfile || exit 0 + # Only add proxy ENVs where set in host - needed to pull the base Ubuntu image + test -n "${http_proxy}" && sed -i "s;INSERT_HTTP_PROXY;${http_proxy};" ubuntu-builder/Dockerfile || exit 0 + test -n "${https_proxy}" && sed -i "s;INSERT_HTTPS_PROXY;${https_proxy};" ubuntu-builder/Dockerfile || exit 0 |