Skip to content

Commit f97f465

Browse files
authored
update to centralized travis configuration (#41)
also make tests pass again by: * change use of scp to cp (as docker image doesn't have it) * add more debugging to broker bash scripts * update activemq download urls as they were broken
1 parent 61206b2 commit f97f465

7 files changed

+13
-73
lines changed

ci/run.sh .ci/run.sh

+6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
#!/bin/bash
2+
# This is intended to be run inside the docker container as the command of the docker-compose.
3+
4+
env
5+
6+
set -ex
7+
28
export ACTIVEMQ_VERSION=5.15.9
39
./setup_broker.sh
410
bundle install

.travis.yml

+2-21
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,2 @@
1-
---
2-
sudo: false
3-
language: ruby
4-
cache: bundler
5-
matrix:
6-
include:
7-
- rvm: jruby-9.1.13.0
8-
env: LOGSTASH_BRANCH=master
9-
- rvm: jruby-9.1.13.0
10-
env: LOGSTASH_BRANCH=7.0
11-
- rvm: jruby-9.1.13.0
12-
env: LOGSTASH_BRANCH=6.7
13-
- rvm: jruby-9.1.13.0
14-
env: LOGSTASH_BRANCH=6.6
15-
- rvm: jruby-1.7.27
16-
env: LOGSTASH_BRANCH=5.6
17-
fast_finish: true
18-
install: true
19-
script: ci/build.sh
20-
jdk: openjdk8
21-
before_install: gem install bundler -v '< 2'
1+
import:
2+
- logstash-plugins/.ci:travis/[email protected]

ci/build.sh

-21
This file was deleted.

ci/setup.sh

-26
This file was deleted.

setup_broker.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#!/bin/bash
2-
set -e
2+
set -xe
33

44
if [ -n "${ACTIVEMQ_VERSION+1}" ]; then
55
echo "ACTIVEMQ_VERSION is $ACTIVEMQ_VERSION"
66
else
77
ACTIVEMQ_VERSION=5.15.8
88
fi
99

10-
curl -s -o activemq-all.jar http://central.maven.org/maven2/org/apache/activemq/activemq-all/$ACTIVEMQ_VERSION/activemq-all-$ACTIVEMQ_VERSION.jar
10+
curl -s -o activemq-all.jar https://repo1.maven.org/maven2/org/apache/activemq/activemq-all/$ACTIVEMQ_VERSION/activemq-all-$ACTIVEMQ_VERSION.jar
1111
mv activemq-all.jar ./spec/inputs/fixtures/
12-
curl -s -o activemq-bin.tar.gz http://apache.mirrors.tds.net/activemq/$ACTIVEMQ_VERSION/apache-activemq-$ACTIVEMQ_VERSION-bin.tar.gz
12+
curl -s -o activemq-bin.tar.gz http://archive.apache.org/dist/activemq/$ACTIVEMQ_VERSION/apache-activemq-$ACTIVEMQ_VERSION-bin.tar.gz
1313
tar xvf activemq-bin.tar.gz
1414
mv apache-activemq-$ACTIVEMQ_VERSION activemq

start_broker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22
set -e
3-
scp ./spec/inputs/fixtures/activemq_plaintext.xml activemq/conf/activemq.xml
3+
cp ./spec/inputs/fixtures/activemq_plaintext.xml activemq/conf/activemq.xml
44
activemq/bin/activemq start

start_ssl_broker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22
set -e
3-
scp ./spec/inputs/fixtures/activemq_ssl.xml activemq/conf/activemq.xml
3+
cp ./spec/inputs/fixtures/activemq_ssl.xml activemq/conf/activemq.xml
44
activemq/bin/activemq start

0 commit comments

Comments
 (0)