From 48bd4b945262edf8558abd9c0dacdd18fe8ef84b Mon Sep 17 00:00:00 2001 From: Kamil Wiatrowski Date: Fri, 11 Jan 2019 07:58:03 +0000 Subject: docker: Add support for experimental collectd container Experimental container is based on master branch and includes set of pull requests with experimental features. By default one addtional PR is included - logparser. Change-Id: I455122b23b6de382f6ef75a790f7b052784b59ac Signed-off-by: Radoslaw Jablonski Signed-off-by: Kamil Wiatrowski --- .../collectd_apply_pull_request.sh | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100755 docker/barometer-collectd-experimental/collectd_apply_pull_request.sh (limited to 'docker/barometer-collectd-experimental/collectd_apply_pull_request.sh') diff --git a/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh b/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh new file mode 100755 index 00000000..dcea33a3 --- /dev/null +++ b/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh @@ -0,0 +1,39 @@ +#! /bin/bash +# Copyright 2019 OPNFV +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# This files contains list of pull requests to be applied on top +# of master branch before building collectd included in docker +# collectd-experimental container + +# Space/newline separated list of pull requests IDs +# for example: +# PULL_REQUESTS=(3027 #reimplement delay rate +# 3028 #other PR +# ) + +PULL_REQUESTS=( + 3045 #logparser + #insert another PR ID here + ) + +# during rebasing/merging git requires email & name to be set +git config user.email "barometer-experimental@container" +git config user.name "BarometerExperimental" + +for PR_ID in "${PULL_REQUESTS[@]}" +do + echo "Applying pull request $PR_ID" + git pull --rebase origin pull/$PR_ID/head +done -- cgit 1.2.3-korg