From e5ef3e9ee650be1d01597ca8493278afcce8fa0e Mon Sep 17 00:00:00 2001
From: Jaime Fullaondo <truthbk@gmail.com>
Date: Tue, 19 Sep 2017 11:18:26 +0200
Subject: [PATCH] [oracle] re-enabling testing. (#761)

* [oracle] re-enabling testing.

* [oracle] move setup to rakefile

* [oracle] fixing rubocops
---
 .travis.yml           | 8 +-------
 oracle/ci/oracle.rake | 8 ++++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c6c31d42b5dea..e7e47f462c33d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/oracle/ci/oracle.rake b/oracle/ci/oracle.rake
index 7982afe60dfc7..ded7cdb239c51 100644
--- a/oracle/ci/oracle.rake
+++ b/oracle/ci/oracle.rake
@@ -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