Adjust images for integration tests (NVIDIA#2096)

* adjust integration tests images
* removed deprecated repo

Signed-off-by: Peixin Li <pxli@nyu.edu>

jenkins/Dockerfile-blossom.integration.centos7 → jenkins/Dockerfile-blossom.integration.centos

@@ -18,21 +18,23 @@
 #
 # Arguments:
 #    CUDA_VER=10.1, 10.2 or 11.0
+#    CENTOS_VER=7 or 8
 #    CUDF_VER=0.18 or 0.19
 #    URM_URL=<maven repo url>
 ###
+
 ARG CUDA_VER=10.1
-FROM nvidia/cuda:${CUDA_VER}-runtime-centos7
+ARG CENTOS_VER=7
+FROM nvidia/cuda:${CUDA_VER}-runtime-centos${CENTOS_VER}
 ARG CUDA_VER
 ARG CUDF_VER
 ARG URM_URL
 
-#Install java-8, maven, docker image
+# Install jdk-8, jdk-11, maven, docker image
 RUN yum update -y && \
-    yum install -y centos-release-scl && \
-    yum install -y java-1.8.0-openjdk-devel wget expect
+    yum install -y java-1.8.0-openjdk-devel java-11-openjdk-devel wget expect
 
-# The default mvn verision is 3.05 on centos7 docker container.
+# The default mvn verision is 3.0.5 on centos7 docker container.
 # The plugin: net.alchim31.maven requires a higher mvn version.
 ENV MAVEN_HOME "/usr/local/apache-maven-3.6.3"
 RUN wget ${URM_URL}/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.tar.gz -P /usr/local && \
@@ -42,15 +44,13 @@ RUN wget ${URM_URL}/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.t
 RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \
     /bin/bash ~/miniconda.sh -b -p /opt/conda && \
     rm -f ~/miniconda.sh
-
 ENV PATH="/opt/conda/bin:$MAVEN_HOME/bin:${PATH}"
-
 # 'pyarrow' and 'pandas' will be installed as the dependencies of cudf below
 RUN conda install -y -c rapidsai -c rapidsai-nightly -c nvidia -c conda-forge -c defaults cudf=${CUDF_VER} python=3.8 cudatoolkit=${CUDA_VER} && \
     conda install -y spacy && python -m spacy download en_core_web_sm && \
     conda install -y -c anaconda pytest requests && \
     conda install -y -c conda-forge sre_yield && \
     conda clean -ay
 
-# Set ENV for mvn
+# Set default java as 1.8.0
 ENV JAVA_HOME "/usr/lib/jvm/java-1.8.0-openjdk"

jenkins/Dockerfile-blossom.integration.ubuntu

@@ -0,0 +1,53 @@
+#
+# Copyright (c) 2020-2021, NVIDIA CORPORATION. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+###
+#
+# Build the image for rapids-plugin development environment
+#
+# Arguments:
+#       CUDA_VER=10.1, 10.2 or 11.0
+#       UBUNTU_VER=18.04 or 20.04
+###
+
+ARG CUDA_VER=11.0
+ARG UBUNTU_VER=18.04
+FROM nvidia/cuda:${CUDA_VER}-runtime-ubuntu${UBUNTU_VER}
+
+# Install jdk-8, jdk-11, maven, docker image
+RUN apt-get update -y && \
+    apt-get install -y software-properties-common
+RUN add-apt-repository ppa:deadsnakes/ppa && \
+    apt-get update -y && \
+    DEBIAN_FRONTEND="noninteractive" apt-get install -y maven \
+    openjdk-8-jdk openjdk-11-jdk python3.8 python3.8-distutils python3-setuptools tzdata git
+RUN python3.8 -m easy_install pip
+
+# Set default jdk as 1.8.0
+RUN update-java-alternatives --set /usr/lib/jvm/java-1.8.0-openjdk-amd64
+
+RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \
+    /bin/bash ~/miniconda.sh -b -p /opt/conda && \
+    rm -f ~/miniconda.sh
+ENV PATH="/opt/conda/bin:$MAVEN_HOME/bin:${PATH}"
+# 'pyarrow' and 'pandas' will be installed as the dependencies of cudf below
+RUN conda install -y -c rapidsai -c rapidsai-nightly -c nvidia -c conda-forge -c defaults cudf=${CUDF_VER} python=3.8 cudatoolkit=${CUDA_VER} && \
+    conda install -y spacy && python -m spacy download en_core_web_sm && \
+    conda install -y -c anaconda pytest requests && \
+    conda install -y -c conda-forge sre_yield && \
+    conda clean -ay
+
+RUN apt install -y inetutils-ping expect

jenkins/Dockerfile-blossom.ubuntu

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2020-2021, NVIDIA CORPORATION. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,14 +27,16 @@ ARG CUDA_VER=11.0
 ARG UBUNTU_VER=18.04
 FROM nvidia/cuda:${CUDA_VER}-runtime-ubuntu${UBUNTU_VER}
 
-#Install java-8, maven, docker image
+# Install jdk-8, jdk-11, maven, docker image
 RUN apt-get update -y && \
     apt-get install -y software-properties-common
 RUN add-apt-repository ppa:deadsnakes/ppa && \
     apt-get update -y && \
     DEBIAN_FRONTEND="noninteractive" apt-get install -y maven \
-    openjdk-8-jdk python3.8 python3.8-distutils python3-setuptools tzdata git
+    openjdk-8-jdk openjdk-11-jdk python3.8 python3.8-distutils python3-setuptools tzdata git
 RUN python3.8 -m easy_install pip
+
+# Set default jdk as 1.8.0
 RUN update-java-alternatives --set /usr/lib/jvm/java-1.8.0-openjdk-amd64
 
 RUN ln -s /usr/bin/python3.8 /usr/bin/python