Skip to content

Commit 18341e3

Browse files
authored
GH-16177: Validate h2o 3 package on r 4 4 and add test image to jenkins (#16291)
* Add update dependencies for R 4.4.0 * Enable R 4.4.0 image * Fix runit_GBM_weight_gamma.R * Deal with .checkFieldsInMethod warning * Add html tidy to the R image for CRAN check * Fix runit_coxph_concordance.R test * Fix runit_coxph_concordance_heart.R test * Fix runit_coxph_predict.R * Fix runit_pubdev_8945_coxph_all_interactions_mojo.R * Fix runit_GBM_ecology.R * Install uplift package even if it was archived * Fix runit_GLM_libR_airlines.R * Fix runit_GLM_offset.R * Fix runit_PUBDEV_6037_fractionalbinomial_mojo.R * Fix runit_PUBDEV_8638_bodyfat_RID_Binomial_compareR_test.R * Fix runit_glrm_PUBDEV_3788_loss_by_col_err.R * Fix runit_isofor_accuracy.R * Fix runit_PUBDEV_8235_modelselection_gaussian_validation.R * Fix runit_OLD_1079_airlines.R * Fix runit_pubdev_6817_noK_PCA.R * Fix runit_pca_5_golden.R * Fix javapredict * Fix runit_head_tail.R * Fix runit_relevel.R * Fix runit_import_upload_singlequoted.R * Fix runit_ifelse.R * Fix runit_h2oconfig.R and .parse.h2oconfig in config.R * Fix runit_as.h2o_sparse.R * Fix runit_pubdev_8218.R * Fix runit_PUBDEV_7362_merge_duplicate_others.R * Fix runit_pubdev_1654.R * Fix runit_pubdev_1398.R * Fix runit_pubdev_1383.R * Fix runit_hexdev_29_categorical_continuous.R * Fix runit_GLM_offset.R for R 3.5 * Add DT to R 4.4 image * Do not set options(stringsAsFactors=TRUE) in the tests * Fix runit_as.h2o_sparse.R * Add new cran messages to validate_r_cmf_check_output.py * More changes to the validate_r_cmd_check_output.py
1 parent 41545d9 commit 18341e3

File tree

59 files changed

+600
-324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+600
-324
lines changed

docker/Jenkinsfile-build-docker

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ IMAGE_NAME_PREFIX = 'harbor.h2o.ai/opsh2oai/h2o-3'
2222
JDK_VERSIONS = ['8', '10', '11', '12', '13', '14', '15', '16', '17']
2323
JDK_VERSIONS_PY_R = ['8', '11', '17'] // stable, last-supported, latest
2424
PYTHON_VERSIONS = ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
25-
R_VERSION = ['3.3.3', '3.4.1', '3.5.3', '3.6.2', '4.0.2']
25+
R_VERSION = ['3.3.3', '3.4.1', '3.5.3', '3.6.2', '4.0.2', '4.4.0']
2626

2727
def pipelineContext
2828

docker/Makefile

+16
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,22 @@ ifeq ($(shell echo $(PUSH) | tr [:upper:] [:lower:] ),true)
276276
docker push harbor.h2o.ai/opsh2oai/h2o-3/dev-r-4.0.2-jdk-$*:$(VERSION)
277277
endif
278278

279+
ifneq ($(CI), 1)
280+
dev-r-4.4.0-jdk-%: dev-r-4.4.0
281+
endif
282+
dev-r-4.4.0-jdk-%:
283+
docker build -t harbor.h2o.ai/opsh2oai/h2o-3/dev-r-4.4.0-jdk-$*:$(VERSION) \
284+
$(NO_CACHE) \
285+
-f jenkins-images/Dockerfile-jdk-others \
286+
--build-arg FROM_VERSION=$(VERSION) \
287+
--build-arg FROM_IMAGE=harbor.h2o.ai/opsh2oai/h2o-3/dev-r-4.4.0 \
288+
--build-arg INSTALL_JAVA_VERSION=$* \
289+
--build-arg H2O_BRANCH=$(H2O_BRANCH) \
290+
.
291+
ifeq ($(shell echo $(PUSH) | tr [:upper:] [:lower:] ),true)
292+
docker push harbor.h2o.ai/opsh2oai/h2o-3/dev-r-4.4.0-jdk-$*:$(VERSION)
293+
endif
294+
279295
ifneq ($(CI), 1)
280296
dev-r-%: dev-r-base
281297
endif

docker/jenkins-images/Dockerfile-r

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ ENV R_VERSION=${R_VERSION}
99
# In C, global variables with multiple tentative definitions now result in linker errors. With -fcommon such definitions
1010
# are silently merged during linking.). I tried using -fcommon but without much luck so due to the time constrain I
1111
# decided to use gcc-9 instead.
12-
RUN apt-get update && apt-get install -y gcc-9 gfortran-9 g++-9 tcl-dev tk-dev && apt-get clean && apt-get autoremove -y && \
12+
RUN apt-get update && apt-get install -y gcc-9 gfortran-9 g++-9 tcl-dev tk-dev tidy && \
13+
apt-get clean && apt-get autoremove -y && \
1314
rm -rf /var/cache/apt/* &&\
1415
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 99 --slave /usr/bin/g++ g++ /usr/bin/g++-9 \
1516
--slave /usr/bin/gcov gcov /usr/bin/gcov-9 && update-alternatives --install /usr/bin/gfortran f95 /usr/bin/gfortran-9 99

0 commit comments

Comments
 (0)