Skip to content

Commit

Permalink
STL-716: Allow LCM Bricks run with C9S and java11
Browse files Browse the repository at this point in the history
  • Loading branch information
hung-nguyen-hoang committed Aug 26, 2024
1 parent dc0cf98 commit e3f48bf
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
12 changes: 3 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-8-jdk-centos9:202311071405.4d8c665
FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jdk-centos9:202405311102.6ba3dcf

ARG RVM_VERSION=stable
ARG JRUBY_VERSION=9.4.1.0

LABEL image_name="GDC LCM Bricks"
LABEL maintainer="LCM <[email protected]>"
LABEL git_repository_url="https://github.com/gooddata/gooddata-ruby/"
LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-8-jdk-centos9:202311071405.4d8c665"
LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jdk-centos9:202405311102.6ba3dcf"

# which is required by RVM
RUN yum install -y which patch make git maven procps \
RUN yum install -y which patch make unzip gnupg git maven procps gzip \
&& yum clean all \
&& rm -rf /var/cache/yum

Expand All @@ -33,9 +33,6 @@ RUN rvm install jruby-${JRUBY_VERSION} && gem update --system \
&& gem install bundler -v 2.4.6 \
&& gem install rake -v 13.0.6

# Make sure java default running with java8
RUN update-alternatives --set java java-1.8.0-openjdk.x86_64

WORKDIR /src

RUN groupadd -g 48 apache \
Expand Down Expand Up @@ -80,9 +77,6 @@ RUN cp -rf ci/mysql/target/*.jar ./lib/gooddata/cloud_resources/mysql/drivers/

RUN bundle install

# Check to make sure Java version is always Java8
RUN java_version=$(java -version 2>&1) && echo "$java_version" | grep 'version.*1.8' || (echo "Java version is not 1.8" && exit 1)

ARG GIT_COMMIT=unspecified
ARG BRICKS_VERSION=unspecified
LABEL git_commit=$GIT_COMMIT
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
source 'https://rubygems.org'

gem 'net-smtp', require: false
gem 'gooddata_datawarehouse', :git => '[email protected]:gooddata/gooddata_datawarehouse', :branch => 'STL-716'

group 'development' do
unless RUBY_PLATFORM == 'java'
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.68
3.7.69
3 changes: 2 additions & 1 deletion gooddata.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ Gem::Specification.new do |s|
s.add_dependency 'azure-storage-blob', '~> 2.0'
s.add_dependency 'nokogiri', '~> 1', '>= 1.10.8'
s.add_dependency 'gli', '~> 2.15'
s.add_dependency 'gooddata_datawarehouse', '~> 0.0.11' if RUBY_PLATFORM == 'java'
# s.add_dependency 'gooddata-dss-jdbc', '~> 0.2.7' if RUBY_PLATFORM == 'java'
# s.add_dependency 'gooddata_datawarehouse', '~> 0.0.11' if RUBY_PLATFORM == 'java'
s.add_dependency 'highline', '= 2.0.0.pre.develop.14'
s.add_dependency 'json_pure', '~> 2.6'
s.add_dependency 'multi_json', '~> 1.12'
Expand Down
4 changes: 4 additions & 0 deletions lib/gooddata/lcm/lcm2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# LICENSE file in the root directory of this source tree.

require 'terminal-table'
require 'jdbc/dss'

require 'gooddata/extensions/class'
require 'gooddata/extensions/true'
Expand Down Expand Up @@ -188,6 +189,9 @@ def respond_to_missing?(name, *_args)
MODE_NAMES = MODES.keys

class << self
Jdbc::DSS.load_driver
Java.com.gooddata.dss.jdbc.driver.DssDriver

def convert_params(params)
# Symbolize all keys
GoodData::Helpers.symbolize_keys!(params)
Expand Down
3 changes: 2 additions & 1 deletion spec/lcm/integration/spec/others/data_helper_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,8 @@
expect(data).to eq File.open(file_path).read
end

it 'connect to mysql mongobi with BASIC authentication' do
# Disable test for MongoBI
xit 'connect to mysql mongobi with BASIC authentication' do
data_helper = GoodData::Helpers::DataSource.new(mysql_mongobi_basic_params['input_source'])
file_path = data_helper.realize(mysql_mongobi_basic_params)
data = File.open('spec/data/mysql_mongobi_data.csv').read
Expand Down

0 comments on commit e3f48bf

Please sign in to comment.