Skip to content

Commit 03fce5e

Browse files
STL-716: Allow LCM Bricks run with C9S and java11
1 parent f0e8035 commit 03fce5e

5 files changed

Lines changed: 8 additions & 13 deletions

File tree

Dockerfile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-8-jdk-centos9:202311071405.4d8c665
1+
FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202403271423.8c7c22c
22

33
ARG RVM_VERSION=stable
44
ARG JRUBY_VERSION=9.4.1.0
55

66
LABEL image_name="GDC LCM Bricks"
77
LABEL maintainer="LCM <lcm@gooddata.com>"
88
LABEL git_repository_url="https://github.com/gooddata/gooddata-ruby/"
9-
LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-8-jdk-centos9:202311071405.4d8c665"
9+
LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202312060945.d0814f3"
1010

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

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

36-
# Make sure java default running with java8
37-
RUN update-alternatives --set java java-1.8.0-openjdk.x86_64
38-
3936
WORKDIR /src
4037

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

8178
RUN bundle install
8279

83-
# Check to make sure Java version is always Java8
84-
RUN java_version=$(java -version 2>&1) && echo "$java_version" | grep 'version.*1.8' || (echo "Java version is not 1.8" && exit 1)
85-
8680
ARG GIT_COMMIT=unspecified
8781
ARG BRICKS_VERSION=unspecified
8882
LABEL git_commit=$GIT_COMMIT

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.69
1+
3.7.70

gooddata.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Gem::Specification.new do |s|
7575
s.add_dependency 'azure-storage-blob', '~> 2.0'
7676
s.add_dependency 'nokogiri', '~> 1', '>= 1.10.8'
7777
s.add_dependency 'gli', '~> 2.15'
78-
s.add_dependency 'gooddata_datawarehouse', '~> 0.0.11' if RUBY_PLATFORM == 'java'
78+
s.add_dependency 'gooddata_datawarehouse', '~> 0.0.12' if RUBY_PLATFORM == 'java'
7979
s.add_dependency 'highline', '= 2.0.0.pre.develop.14'
8080
s.add_dependency 'json_pure', '~> 2.6'
8181
s.add_dependency 'multi_json', '~> 1.12'

lib/gooddata/models/metadata/label.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def get_valid_elements(*args)
5656
params[:offset] = offset
5757
params[:limit] = paging_limit
5858
results, = valid_elements params
59-
all_valid_elements << results['validElements']['items'].select do |i|
59+
all_valid_elements += results['validElements']['items'].select do |i|
6060
i['element']['title'] == params[:filter]
6161
end
6262

spec/lcm/integration/spec/others/data_helper_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,8 @@
296296
expect(data).to eq File.open(file_path).read
297297
end
298298

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

0 commit comments

Comments
 (0)