Skip to content

Commit

Permalink
[oracle] re-enabling testing. (#761)
Browse files Browse the repository at this point in the history
* [oracle] re-enabling testing.

* [oracle] move setup to rakefile

* [oracle] fixing rubocops
  • Loading branch information
truthbk committed Sep 19, 2017
1 parent 82de3b0 commit e5ef3e9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
8 changes: 1 addition & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,7 @@ install:
- echo "$HOME/dd-agent/" > $(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/datadog-agent.pth
- if [ -e ~/dd-agent/requirements.txt ]; then pip install -r ~/dd-agent/requirements.txt; fi
- bundle exec rake setup_agent_libs
# - sudo apt-get -qqy install npm
# - pip install pexpect==4.2.1
# - mkdir -p $ORACLE_DIR
# - $TRAVIS_BUILD_DIR/oracle/ci/resources/get_instantclient.py --agree=yes
# - echo "$ORACLE_HOME" | sudo tee /etc/ld.so.conf.d/oracle_instantclient.conf
# - sudo ldconfig
# - if [ ! -e $ORACLE_HOME/libclntsh.so ]; then ln -s $ORACLE_HOME/libclntsh.so.12.1 $ORACLE_HOME/libclntsh.so; fi
- sudo apt-get -qqy install npm
script:
- bundle exec rake prep_travis_ci
- bundle exec rake ci:run
Expand Down
8 changes: 8 additions & 0 deletions oracle/ci/oracle.rake
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ container_port_8080 = 80_80
namespace :ci do
namespace :oracle do |flavor|
task before_install: ['ci:common:before_install'] do
sh %(pip install pexpect==4.2.1)
sh %(mkdir -p #{ENV['ORACLE_DIR']})
sh %(#{ENV['TRAVIS_BUILD_DIR']}/oracle/ci/resources/get_instantclient.py --agree=yes)
sh %(echo #{ENV['ORACLE_HOME']} | sudo tee /etc/ld.so.conf.d/oracle_instantclient.conf)
sh %(sudo ldconfig)
unless File.exist?("#{ENV['ORACLE_HOME']}/libclntsh.so")
sh %(ln -s #{ENV['ORACLE_HOME']}/libclntsh.so.12.1 #{ENV['ORACLE_HOME']}/libclntsh.so)
end
`docker kill $(docker ps -q --filter name=#{container_name}) || true`
`docker rm $(docker ps -aq --filter name=#{container_name}) || true`
end
Expand Down

0 comments on commit e5ef3e9

Please sign in to comment.