Browse Source

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)
tags/8.0.1
Radosław Piliszek 1 month ago
parent
commit
b5a6da0dd7
2 changed files with 2 additions and 12 deletions
  1. 2
    10
      .zuul.d/centos.yaml
  2. 0
    2
      docker/fluentd/Dockerfile.j2

+ 2
- 10
.zuul.d/centos.yaml View File

@@ -8,7 +8,8 @@
8 8
         - kolla-ansible-centos-binary
9 9
         - kolla-ansible-centos-source-upgrade
10 10
         - tripleo-build-containers-centos-7:
11
-            voting: true
11
+            # FIXME(yoctozepto): set to voting when TripleO CI is fixed
12
+            voting: false
12 13
             files:
13 14
               - ^.zuul.d/centos.yaml$
14 15
               - ^docker/.*$
@@ -24,15 +25,6 @@
24 25
       queue: kolla
25 26
       jobs:
26 27
         - kolla-build-centos-source
27
-        - tripleo-build-containers-centos-7:
28
-            voting: true
29
-            files:
30
-              - ^.zuul.d/centos.yaml$
31
-              - ^docker/.*$
32
-              - ^kolla/.*$
33
-              - ^requirements.txt$
34
-              - ^setup.cfg$
35
-              - ^setup.py$
36 28
     periodic:
37 29
       jobs:
38 30
         - kolla-publish-centos-source

+ 0
- 2
docker/fluentd/Dockerfile.j2 View File

@@ -21,7 +21,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
21 21
         'ruby-devel',
22 22
         'rubygem-fluent-plugin-elasticsearch',
23 23
         'rubygem-fluent-plugin-grok-parser',
24
-        'rubygem-fluent-plugin-kubernetes_metadata_filter',
25 24
         'rubygem-fluent-plugin-rewrite-tag-filter',
26 25
         'rubygem-fluent-plugin-secure-forward'
27 26
     ] %}
@@ -65,7 +64,6 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
65 64
         'fluent-plugin-elasticsearch',
66 65
         'fluent-plugin-grep',
67 66
         'fluent-plugin-grok-parser:2.1.4',
68
-        'fluent-plugin-kubernetes_metadata_filter',
69 67
         'fluent-plugin-parser',
70 68
         'fluent-plugin-rewrite-tag-filter:2.0.0',
71 69
         'fluent-plugin-secure-forward',

Loading…
Cancel
Save