Merge "Unbreak CI: fluentd and TripleO dependency"
This commit is contained in:
commit
6320b05f71
|
@ -8,7 +8,8 @@
|
||||||
- kolla-ansible-centos-binary
|
- kolla-ansible-centos-binary
|
||||||
- kolla-ansible-centos-source-upgrade
|
- kolla-ansible-centos-source-upgrade
|
||||||
- tripleo-build-containers-centos-7:
|
- tripleo-build-containers-centos-7:
|
||||||
voting: true
|
# FIXME(yoctozepto): set to voting when TripleO CI is fixed
|
||||||
|
voting: false
|
||||||
files:
|
files:
|
||||||
- ^.zuul.d/centos.yaml$
|
- ^.zuul.d/centos.yaml$
|
||||||
- ^docker/.*$
|
- ^docker/.*$
|
||||||
|
@ -34,7 +35,8 @@
|
||||||
jobs:
|
jobs:
|
||||||
- kolla-build-centos-source
|
- kolla-build-centos-source
|
||||||
- tripleo-build-containers-centos-7:
|
- tripleo-build-containers-centos-7:
|
||||||
voting: true
|
# FIXME(yoctozepto): set to voting when TripleO CI is fixed
|
||||||
|
voting: false
|
||||||
files:
|
files:
|
||||||
- ^.zuul.d/centos.yaml$
|
- ^.zuul.d/centos.yaml$
|
||||||
- ^docker/.*$
|
- ^docker/.*$
|
||||||
|
|
|
@ -21,7 +21,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
'ruby-devel',
|
'ruby-devel',
|
||||||
'rubygem-fluent-plugin-elasticsearch',
|
'rubygem-fluent-plugin-elasticsearch',
|
||||||
'rubygem-fluent-plugin-grok-parser',
|
'rubygem-fluent-plugin-grok-parser',
|
||||||
'rubygem-fluent-plugin-kubernetes_metadata_filter',
|
|
||||||
'rubygem-fluent-plugin-rewrite-tag-filter',
|
'rubygem-fluent-plugin-rewrite-tag-filter',
|
||||||
'rubygem-fluent-plugin-secure-forward'
|
'rubygem-fluent-plugin-secure-forward'
|
||||||
] %}
|
] %}
|
||||||
|
@ -83,7 +82,6 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
|
||||||
'fluent-plugin-elasticsearch',
|
'fluent-plugin-elasticsearch',
|
||||||
'fluent-plugin-grep',
|
'fluent-plugin-grep',
|
||||||
'fluent-plugin-grok-parser:2.1.4',
|
'fluent-plugin-grok-parser:2.1.4',
|
||||||
'fluent-plugin-kubernetes_metadata_filter',
|
|
||||||
'fluent-plugin-parser',
|
'fluent-plugin-parser',
|
||||||
'fluent-plugin-rewrite-tag-filter:2.0.0',
|
'fluent-plugin-rewrite-tag-filter:2.0.0',
|
||||||
'fluent-plugin-secure-forward',
|
'fluent-plugin-secure-forward',
|
||||||
|
|
Loading…
Reference in New Issue