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 07b55048e6)
This commit is contained in:
Radosław Piliszek 2019-08-19 10:30:58 +02:00 committed by Marcin Juszkiewicz
parent cd4d4b37be
commit b5a6da0dd7
2 changed files with 2 additions and 12 deletions

View File

@ -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

View File

@ -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',