Update td-agent and fluentd versions in test cases

awslabs · Jan 8, 2023 · fac107f · fac107f
1 parent 5a74915
commit fac107f
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,12 +13,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - gemfile: gemfiles/Gemfile.fluentd-1.14.6 # Latest Fluentd / https://www.fluentd.org/download
-            ruby-version: 3.1.2 # Latest supported Ruby / https://www.ruby-lang.org/en/downloads & https://rubies.travis-ci.org
+          - gemfile: gemfiles/Gemfile.fluentd-1.15.3 # Latest Fluentd / https://www.fluentd.org/download
+            ruby-version: 3.2.0 # Latest supported Ruby / https://www.ruby-lang.org/en/downloads
           - gemfile: gemfiles/Gemfile.fluentd-0.14.22 # Oldest supported Fluentd
             ruby-version: 2.6.10 # Oldest supported Ruby
-          - gemfile: gemfiles/Gemfile.td-agent-3.1.0
-            ruby-version: 2.4.2 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.1.0/config/projects/td-agent3.rb#L20
+          # - gemfile: gemfiles/Gemfile.td-agent-3.1.0
+          #   ruby-version: 2.4.2 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.1.0/config/projects/td-agent3.rb#L20
           # - gemfile: gemfiles/Gemfile.td-agent-3.1.1
           #   ruby-version: 2.4.2 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.1.1/config/projects/td-agent3.rb#L17
           # - gemfile: gemfiles/Gemfile.td-agent-3.2.0
@@ -43,8 +43,8 @@ jobs:
           #   ruby-version: 2.4.10 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.7.1/config/projects/td-agent3.rb#L22
           - gemfile: gemfiles/Gemfile.td-agent-3.8.0 # Latest official release of td-agent v3
             ruby-version: 2.4.10 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.8.0/config/projects/td-agent3.rb#L22
-          - gemfile: gemfiles/Gemfile.td-agent-3.8.1 # Maintenance release of td-agent v3
-            ruby-version: 2.4.10 # https://github.com/treasure-data/omnibus-td-agent/pull/273/files#diff-f73e763ace61e7c4bf48bf94bd6e295bc2cfd1ce5f9e38a4d19e266353e37498R22
+          # - gemfile: gemfiles/Gemfile.td-agent-3.8.1 # Maintenance release of td-agent v3
+          #   ruby-version: 2.4.10 # https://github.com/treasure-data/omnibus-td-agent/pull/273/files#diff-f73e763ace61e7c4bf48bf94bd6e295bc2cfd1ce5f9e38a4d19e266353e37498R22
           # - gemfile: gemfiles/Gemfile.td-agent-4.0.0
           #   ruby-version: 2.7.1 # https://github.com/fluent/fluent-package-builder/blob/41b3436d43c21e48a9cf34c58ae640f0e3dfb44c/td-agent/config.rb#L16
           - gemfile: gemfiles/Gemfile.td-agent-4.0.1
@@ -57,8 +57,16 @@ jobs:
             ruby-version: 2.7.4 # https://github.com/fluent/fluent-package-builder/blob/v4.2.0/td-agent/config.rb#L21
           # - gemfile: gemfiles/Gemfile.td-agent-4.3.0
           #   ruby-version: 2.7.5 # https://github.com/fluent/fluent-package-builder/blob/v4.3.0/td-agent/config.rb#L21
-          - gemfile: gemfiles/Gemfile.td-agent-4.3.1
-            ruby-version: 2.7.6 # https://github.com/fluent/fluent-package-builder/blob/v4.3.1/td-agent/config.rb#L19
+          # - gemfile: gemfiles/Gemfile.td-agent-4.3.1
+          #   ruby-version: 2.7.6 # https://github.com/fluent/fluent-package-builder/blob/v4.3.1/td-agent/config.rb#L19
+          - gemfile: gemfiles/Gemfile.td-agent-4.3.2
+            ruby-version: 2.7.6 # https://github.com/fluent/fluent-package-builder/blob/v4.3.2/td-agent/config.rb#L23
+          # - gemfile: gemfiles/Gemfile.td-agent-4.4.0
+          #   ruby-version: 2.7.6 # https://github.com/fluent/fluent-package-builder/blob/v4.4.0/td-agent/config.rb#L23
+          # - gemfile: gemfiles/Gemfile.td-agent-4.4.1
+          #   ruby-version: 2.7.6 # https://github.com/fluent/fluent-package-builder/blob/v4.4.1/td-agent/config.rb#L23
+          - gemfile: gemfiles/Gemfile.td-agent-4.4.2
+            ruby-version: 2.7.6 # https://github.com/fluent/fluent-package-builder/blob/v4.4.2/td-agent/config.rb#L23
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}

diff --git a/gemfiles/Gemfile.fluentd-1.14.6 → gemfiles/Gemfile.fluentd-1.15.3 b/gemfiles/Gemfile.fluentd-1.14.6 → gemfiles/Gemfile.fluentd-1.15.3
@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
 gemspec path: ".."
 
-gem "fluentd", "1.14.6"
+gem "fluentd", "1.15.3"
diff --git a/gemfiles/Gemfile.td-agent-4.3.2 b/gemfiles/Gemfile.td-agent-4.3.2
@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
+gemspec path: ".."
+
+# Specify related gems for td-agent v4.3.2
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/v4.3.2/td-agent/config.rb#L4
+gem "fluentd", "1.14.6"
+# https://github.com/fluent/fluent-package-builder/blob/v4.3.2/td-agent/Gemfile#L45-L55
+gem "prometheus-client", "2.1.0"
+gem "fluent-plugin-prometheus", "2.0.2"
+gem "fluent-plugin-prometheus_pushgateway", "0.1.0"
+gem "jmespath", "1.6.1"
+gem "aws-partitions", "1.577.0"
+gem "aws-sdk-core", "3.130.1"
+gem "aws-sdk-kms", "1.55.0"
+gem "aws-sdk-sqs", "1.51.0"
+gem "aws-sigv4", "1.4.0"
+gem "aws-sdk-s3", "1.113.0"
+gem "fluent-plugin-s3", "1.6.1"
diff --git a/gemfiles/Gemfile.td-agent-4.4.0 b/gemfiles/Gemfile.td-agent-4.4.0
@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
+gemspec path: ".."
+
+# Specify related gems for td-agent v4.4.0
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/v4.4.0/td-agent/config.rb#L4
+gem "fluentd", "1.15.1"
+# https://github.com/fluent/fluent-package-builder/blob/v4.4.0/td-agent/Gemfile#L45-L55
+gem "prometheus-client", "2.1.0"
+gem "fluent-plugin-prometheus", "2.0.3"
+gem "fluent-plugin-prometheus_pushgateway", "0.1.0"
+gem "jmespath", "1.6.1"
+gem "aws-partitions", "1.609.0"
+gem "aws-sdk-core", "3.131.3"
+gem "aws-sdk-kms", "1.58.0"
+gem "aws-sdk-sqs", "1.51.1"
+gem "aws-sigv4", "1.5.1"
+gem "aws-sdk-s3", "1.114.0"
+gem "fluent-plugin-s3", "1.7.1"
diff --git a/gemfiles/Gemfile.td-agent-4.4.1 b/gemfiles/Gemfile.td-agent-4.4.1
@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
+gemspec path: ".."
+
+# Specify related gems for td-agent v4.4.1
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/v4.4.1/td-agent/config.rb#L4
+gem "fluentd", "1.15.2"
+# https://github.com/fluent/fluent-package-builder/blob/v4.4.1/td-agent/Gemfile#L45-L55
+gem "prometheus-client", "2.1.0"
+gem "fluent-plugin-prometheus", "2.0.3"
+gem "fluent-plugin-prometheus_pushgateway", "0.1.0"
+gem "jmespath", "1.6.1"
+gem "aws-partitions", "1.609.0"
+gem "aws-sdk-core", "3.131.3"
+gem "aws-sdk-kms", "1.58.0"
+gem "aws-sdk-sqs", "1.51.1"
+gem "aws-sigv4", "1.5.1"
+gem "aws-sdk-s3", "1.114.0"
+gem "fluent-plugin-s3", "1.7.1"
diff --git a/gemfiles/Gemfile.td-agent-4.4.2 b/gemfiles/Gemfile.td-agent-4.4.2
@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
+gemspec path: ".."
+
+# Specify related gems for td-agent v4.4.2
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/v4.4.2/td-agent/config.rb#L4
+gem "fluentd", "1.15.3"
+# https://github.com/fluent/fluent-package-builder/blob/v4.4.2/td-agent/Gemfile#L45-L55
+gem "prometheus-client", "2.1.0"
+gem "fluent-plugin-prometheus", "2.0.3"
+gem "fluent-plugin-prometheus_pushgateway", "0.1.0"
+gem "jmespath", "1.6.1"
+gem "aws-partitions", "1.650.0"
+gem "aws-sdk-core", "3.164.0"
+gem "aws-sdk-kms", "1.58.0"
+gem "aws-sdk-sqs", "1.51.1"
+gem "aws-sigv4", "1.5.2"
+gem "aws-sdk-s3", "1.116.0"
+gem "fluent-plugin-s3", "1.7.2"