Skip to content

Commit

Permalink
Bump requirements for integration tests (#5058)
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrian Gonzalez-Martin authored Jul 27, 2023
1 parent b1e4338 commit 8713b15
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
docs-lint:

runs-on: ubuntu-latest
container: seldonio/core-builder:0.27
container: seldonio/core-builder:0.30

steps:
- uses: actions/checkout@v2
Expand All @@ -21,7 +21,7 @@ jobs:
docs-build:

runs-on: ubuntu-latest
container: seldonio/core-builder:0.27
container: seldonio/core-builder:0.30

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .lighthouse/jenkins-x/benchmark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
name: ""
- name: benchmark-step
image: seldonio/core-builder:0.27
image: seldonio/core-builder:0.30
env:
- name: SELDON_E2E_TESTS_TO_RUN
value: benchmark
Expand Down
2 changes: 1 addition & 1 deletion .lighthouse/jenkins-x/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
name: ""
- name: integration-step
image: seldonio/core-builder:0.29
image: seldonio/core-builder:0.30
env:
- name: DOCKER_BUILDKIT
value: "0"
Expand Down
2 changes: 1 addition & 1 deletion .lighthouse/jenkins-x/models.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
name: ""
- name: models-step
image: seldonio/core-builder:0.27
image: seldonio/core-builder:0.30
command:
- bash
- -c
Expand Down
2 changes: 1 addition & 1 deletion .lighthouse/jenkins-x/notebooks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
name: ""
- name: notebooks-step
image: seldonio/core-builder:0.29
image: seldonio/core-builder:0.30
env:
- name: DOCKER_BUILDKIT
value: "0"
Expand Down
2 changes: 1 addition & 1 deletion .lighthouse/jenkins-x/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
name: ""
- name: release-step
image: seldonio/core-builder:0.27
image: seldonio/core-builder:0.30
env:
- name: DOCKER_BUILDKIT
value: "0"
Expand Down
17 changes: 9 additions & 8 deletions core-builder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM openjdk:13.0.1-jdk-buster

ENV PYTHON_VERSION "3.7.11"
ENV PYTHON_VERSION "3.8.10"

# install docker
RUN \
Expand Down Expand Up @@ -45,10 +45,10 @@ RUN \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

# Install maven
ENV MAVEN_VERSION=3.6.3
ENV MAVEN_VERSION=3.9.3
ENV USER_HOME_DIR="/root"
ENV SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
ENV BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
ENV SHA=400fc5b6d000c158d5ee7937543faa06b6bda8408caa2444a9c947c21472fde0f0b64ac452b8cec8855d528c0335522ed5b6c8f77085811c7e29e1bedbb5daa2
ENV BASE_URL=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
&& curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
&& echo "${SHA} /tmp/apache-maven.tar.gz" | sha512sum -c - \
Expand All @@ -67,17 +67,18 @@ RUN apt-get upgrade && \
apt-get install libbz2-dev -y && \
apt-get install liblzma-dev -y

ENV CONDA_VERSION "4.7.12"
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-$CONDA_VERSION-Linux-x86_64.sh -O ~/miniconda.sh && \
ENV CONDA_DOWNLOAD_VERSION="py38_23.3.1-0"
ENV CONDA_VERSION "23.5.0"
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_DOWNLOAD_VERSION}-Linux-x86_64.sh -O ~/miniconda.sh && \
/bin/bash ~/miniconda.sh -b -p /opt/conda && \
rm ~/miniconda.sh && \
/opt/conda/bin/conda clean -tipsy && \
/opt/conda/bin/conda clean -tipy && \
ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \
echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \
echo "conda activate base" >> ~/.bashrc && \
chgrp -R root /opt/conda && chmod -R g+rw /opt/conda
ENV PATH="/opt/conda/bin:${PATH}"
ENV PYTHON_VERSION "3.7.10"
ENV PYTHON_VERSION "3.8.10"

# This is to install desired version of Python without updating conda version
RUN conda install --yes python=$PYTHON_VERSION conda=$CONDA_VERSION
Expand Down
2 changes: 1 addition & 1 deletion core-builder/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DOCKER_IMAGE_NAME=seldonio/core-builder
DOCKER_IMAGE_VERSION=0.29
DOCKER_IMAGE_VERSION=0.30

build_docker_image:
cp ../testing/scripts/dev_requirements.txt .
Expand Down
8 changes: 4 additions & 4 deletions testing/scripts/dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ sh==1.13.1
# notebooks test deps
ipython==7.13.0
nbconvert==5.6.1
alibi==0.5.2
shap==0.35.0
alibi==0.9.2
shap==0.40.0
matplotlib==3.1.3
tensorflow==2.4.0
tensorflow==2.12.1
tabulate==0.8.7
Jinja2==3.0.0

# 2nd lvl dep on cov required to avoid sqllite dep
coverage==4.5.4

# Required to build mock test images
mlserver==1.1.0
mlserver==1.3.5

0 comments on commit 8713b15

Please sign in to comment.