From b9a8cb15c3b2c13ab25d97ac9f9b67fd5288f388 Mon Sep 17 00:00:00 2001
From: Adam Valenta <adam.valenta@h2o.ai>
Date: Fri, 28 Feb 2025 21:29:52 +0100
Subject: [PATCH] GH-16542 Build rest of the images (#16581)

* try to build what is missing

* fix python 3.11 numpy package

* install future for python 3.11

* Fix for No module named 'pandas.util.testing'

* Fix makefile default values changed by mistake

* Downgrade miniconda to fix release image

* Add R version that was built before to have a complete list

* Comment conda downgrade
---
 docker/Jenkinsfile-build-docker          | 8 ++++----
 docker/Makefile                          | 4 ++--
 docker/jenkins-images/Dockerfile-release | 3 ++-
 h2o-py/test-requirements.txt             | 5 ++++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/docker/Jenkinsfile-build-docker b/docker/Jenkinsfile-build-docker
index dcaa74c164a3..fcc06cfa5d5a 100644
--- a/docker/Jenkinsfile-build-docker
+++ b/docker/Jenkinsfile-build-docker
@@ -21,10 +21,10 @@ properties([
 
 // IMAGE_NAME_PREFIX = 'harbor.h2o.ai/opsh2oai/h2o-3'
 
-JDK_VERSIONS = ['8']
-JDK_VERSIONS_PY_R = ['8'] // stable, last-supported, latest
-PYTHON_VERSIONS = ['3.7']
-R_VERSION = ['3.4.1']
+JDK_VERSIONS = ['8', '11', '17']
+JDK_VERSIONS_PY_R = ['8', '11', '17'] // stable, last-supported, latest
+PYTHON_VERSIONS = ['3.6', '3.7','3.8', '3.9', '3.10', '3.11']
+R_VERSION = ['3.4.1', '3.5.3', '4.4.0']
 
 def pipelineContext
 
diff --git a/docker/Makefile b/docker/Makefile
index c210e1373511..6f6dffe89621 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -2,10 +2,10 @@ SHELL := /bin/bash
 THIS_FILE := $(lastword $(MAKEFILE_LIST))
 .PHONY : all
 
-VERSION ?= 45
+VERSION ?= dev
 PUSH ?= 0
 H2O_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
-NO_CACHE ?= 
+NO_CACHE ?= --no-cache
 BASE_FROM_IMAGE := nvidia/cuda:12.1.0-devel-ubuntu22.04
 
 dev-base:
diff --git a/docker/jenkins-images/Dockerfile-release b/docker/jenkins-images/Dockerfile-release
index b59dd696fc69..4ea21284c651 100644
--- a/docker/jenkins-images/Dockerfile-release
+++ b/docker/jenkins-images/Dockerfile-release
@@ -10,7 +10,8 @@ RUN \
 
 # Install conda
 RUN \
-    curl -sSL https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -o /tmp/miniconda.sh && \
+    # Downgrade conda because conda packages cannot be converted on the latest version. If you upgrade, run test release to check if conda can be build and converted.
+    curl -sSL https://repo.continuum.io/miniconda/Miniconda3-py37_4.12.0-Linux-x86_64.sh -o /tmp/miniconda.sh && \
     bash /tmp/miniconda.sh -bfp /usr/local && \
     rm /tmp/miniconda.sh && \
     conda install -y anaconda-client conda-build && \
diff --git a/h2o-py/test-requirements.txt b/h2o-py/test-requirements.txt
index 12807923acc3..248e572e2c83 100644
--- a/h2o-py/test-requirements.txt
+++ b/h2o-py/test-requirements.txt
@@ -13,11 +13,13 @@ wheel<=0.42.0; python_version < '3.7'
 wheel==0.42.0; python_version >= '3.7'
 numpy<=1.23.5; python_version < '3.8'
 numpy==1.23.5; python_version >= '3.8'
+numpy==1.26.4; python_version == '3.11'
 scipy==1.5.4; python_version == '3.6'
 scipy==1.6.3; python_version == '3.7'
 scipy==1.10.1; python_version > '3.7'
 pandas==0.24.2; python_version == '3.6'
-pandas==1.3.5; python_version > '3.6'
+pandas==1.3.5; python_version > '3.6' and python_version < '3.11'
+pandas==1.5.3; python_version >= '3.11'
 pyarrow==10.0.1; python_version > '3.6'
 statsmodels==0.12.2; python_version == '3.6'
 statsmodels==0.13.5; python_version > '3.6'
@@ -54,3 +56,4 @@ typing_extensions==4.9.0; python_version >= '3.8'
 mypy==0.971; python_version < '3.7'
 mypy==1.4.1; python_version >= '3.7' and python_version < '3.8'
 mypy==1.8.0; python_version >= '3.8'
+future; python_version == '3.11'