diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-08-19 10:30:58 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2019-08-19 15:23:13 +0200 |
| commit | b5a6da0dd7735e272ff2e2d1b6d931036601f308 (patch) | |
| tree | b09ed669620090302db59b7029e84e64900a55b5 | |
| parent | cd4d4b37be3ad75d23a48fd58a550ff08684e270 (diff) | |
| download | kolla-b5a6da0dd7735e272ff2e2d1b6d931036601f308.tar.gz kolla-b5a6da0dd7735e272ff2e2d1b6d931036601f308.zip | |
Unbreak CI: fluentd and TripleO dependency
fluentd - we are not deploying kubernetes, no need for plugins
TripleO - CI currently broken (to reverse, FIXME in place)
- dropped TripleO from gate
Change-Id: I203f70176af7f2b53398ddeb5c21e6234a45e268
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
(cherry picked from commit 07b55048e63f27c1045735624c845d1af95a11fd)
| -rw-r--r-- | .zuul.d/centos.yaml | 12 | ||||
| -rw-r--r-- | docker/fluentd/Dockerfile.j2 | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index cc33602ef..98a6d8ab5 100644 --- a/.zuul.d/centos.yaml +++ b/.zuul.d/centos.yaml @@ -8,7 +8,8 @@ - kolla-ansible-centos-binary - kolla-ansible-centos-source-upgrade - tripleo-build-containers-centos-7: - voting: true + # FIXME(yoctozepto): set to voting when TripleO CI is fixed + voting: false files: - ^.zuul.d/centos.yaml$ - ^docker/.*$ @@ -24,15 +25,6 @@ queue: kolla jobs: - kolla-build-centos-source - - tripleo-build-containers-centos-7: - voting: true - files: - - ^.zuul.d/centos.yaml$ - - ^docker/.*$ - - ^kolla/.*$ - - ^requirements.txt$ - - ^setup.cfg$ - - ^setup.py$ periodic: jobs: - kolla-publish-centos-source diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2 index 814e2bd36..e4662ca8c 100644 --- a/docker/fluentd/Dockerfile.j2 +++ b/docker/fluentd/Dockerfile.j2 @@ -21,7 +21,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'ruby-devel', 'rubygem-fluent-plugin-elasticsearch', 'rubygem-fluent-plugin-grok-parser', - 'rubygem-fluent-plugin-kubernetes_metadata_filter', 'rubygem-fluent-plugin-rewrite-tag-filter', 'rubygem-fluent-plugin-secure-forward' ] %} @@ -65,7 +64,6 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start 'fluent-plugin-elasticsearch', 'fluent-plugin-grep', 'fluent-plugin-grok-parser:2.1.4', - 'fluent-plugin-kubernetes_metadata_filter', 'fluent-plugin-parser', 'fluent-plugin-rewrite-tag-filter:2.0.0', 'fluent-plugin-secure-forward', |