diff options
| author | Jorge Niedbalski <jorge.niedbalski@linaro.org> | 2018-05-11 15:19:14 -0300 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-05-15 06:51:44 +0000 |
| commit | bba8a790c53d8033cd3ae54fc98054cda10bf448 (patch) | |
| tree | 602ab78d93c9af012b4400f605dd432f39e41c20 /leg-kolla | |
| parent | 15e55b87e489fd640eff1dff510aadd7d01770f1 (diff) | |
leg-kolla*: Add DEVCLOUD_EXTRA_PATCHES parameter.
This patch implements a new parameter for allowing to apply
extra patches that haven't been merged into the kolla stable/queens
branch.
If any patch exists, the -pPATCH_NUMBER postfix will be
appended to the image tag.
Change-Id: I32c30146c8fdceb676fc44e16927d5f86b4f26f4
Signed-off-by: Jorge Niedbalski <jorge.niedbalski@linaro.org>
Diffstat (limited to 'leg-kolla')
| -rw-r--r-- | leg-kolla/build.sh | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/leg-kolla/build.sh b/leg-kolla/build.sh index 7386fc4f..40f29f7d 100644 --- a/leg-kolla/build.sh +++ b/leg-kolla/build.sh @@ -4,6 +4,7 @@ kolla_branch=${BRANCH} kolla_ldc=${DEVCLOUD} +kolla_ldc_extras=${DEVCLOUD_EXTRA_PATCHES} kolla_options= if [ -z "${kolla_branch}" -o "${kolla_branch}" == "master" ]; then @@ -13,7 +14,17 @@ else if [ -z "${kolla_ldc}" ]; then kolla_tag=queens-${BUILD_NUMBER} else - kolla_tag=ldc-queens-${BUILD_NUMBER} + patches_count=0 + if [ ! -z ${kolla_ldc_extras} ]; then + patches_count=$(echo ${kolla_ldc_extras} | tr ',' ' ' | wc -w) + fi + + if [ "${patches_count}" -eq "0" ]; then + kolla_tag=ldc-queens-${BUILD_NUMBER} + else + kolla_tag=ldc-queens-${BUILD_NUMBER}-p${patches_count} + fi + kolla_options="--template-override ../Linaro-overlay/linaro-override.j2" fi fi @@ -56,6 +67,14 @@ if [ ${kolla_branch} == "master" ]; then rm -rf kolla/docker/neutron/neutron-server-opendaylight fi +# Apply extra patches to the kolla source code that haven't +# been merged into the stable/queens branch. +if [[ ! -z ${kolla_ldc} && ! -z ${kolla_ldc_extras} ]]; then + echo ${kolla_ldc_extras} | sed -n 1'p' | tr ',' '\n' | while read patch; do + curl https://git.openstack.org/cgit/openstack/kolla/patch/?id=${patch} | git apply -v --index --directory=kolla/ + done +fi + virtualenv --python=/usr/bin/python2 venv-for-kolla . venv-for-kolla/bin/activate |