Skip to content

Commit 8a26010

Browse files
committed
Test against latest td-agent versions
1 parent 47dc708 commit 8a26010

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

Rakefile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,7 @@ namespace :docker do
2222
distros.each do |distro|
2323
task distro do
2424
puts "testing on #{distro}"
25-
begin
26-
FileUtils.cp("test/docker/Dockerfile.#{distro}", 'Dockerfile')
27-
sh 'docker build .'
28-
ensure
29-
FileUtils.rm('Dockerfile')
30-
end
25+
sh "docker build . -f test/docker/Dockerfile.#{distro}"
3126
end
3227
end
3328
end
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM centos:7.1.1503
1+
FROM centos:7
22

33
RUN yum remove -y fakesystemd \
44
&& rpm --import https://packages.treasuredata.com/GPG-KEY-td-agent \
5-
&& printf "[treasuredata]\nname=TreasureData\nbaseurl=http://packages.treasuredata.com/2/redhat/\$releasever/\$basearch\ngpgcheck=1\ngpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent\n" > /etc/yum.repos.d/td.repo \
5+
&& printf "[treasuredata]\nname=TreasureData\nbaseurl=http://packages.treasuredata.com/3/redhat/\$releasever/\$basearch\ngpgcheck=1\ngpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent\n" > /etc/yum.repos.d/td.repo \
66
&& yum install -y td-agent make gcc-c++ systemd
77

88
ENV PATH /opt/td-agent/embedded/bin/:$PATH
@@ -12,4 +12,4 @@ COPY Gemfile ./
1212
COPY fluent-plugin-systemd.gemspec ./
1313
RUN bundle install
1414
COPY . .
15-
RUN rake test TESTOPTS="-v"
15+
RUN bundle exec rake test TESTOPTS="-v"

test/docker/Dockerfile.tdagent-ubuntu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN apt-get update -q \
77
ca-certificates \
88
libsystemd0 \
99
&& curl https://packages.treasuredata.com/GPG-KEY-td-agent | apt-key add - \
10-
&& echo "deb http://packages.treasuredata.com/2/ubuntu/xenial/ xenial contrib" > /etc/apt/sources.list.d/treasure-data.list \
10+
&& echo "deb http://packages.treasuredata.com/3/ubuntu/xenial/ xenial contrib" > /etc/apt/sources.list.d/treasure-data.list \
1111
&& apt-get update \
1212
&& apt-get install -y td-agent \
1313
&& apt-get clean \
@@ -22,4 +22,4 @@ COPY Gemfile ./
2222
COPY fluent-plugin-systemd.gemspec ./
2323
RUN bundle check || bundle install
2424
COPY . .
25-
RUN rake test TESTOPTS="-v"
25+
RUN bundle exec rake test TESTOPTS="-v"

0 commit comments

Comments
 (0)