Skip to content

Commit

Permalink
[CI] [GHA] Drop Python 3.8 testing in GHA (openvinotoolkit#26586)
Browse files Browse the repository at this point in the history
### Tickets:
 - *151796*
  • Loading branch information
akashchi authored Sep 18, 2024
1 parent cd7e0e5 commit d4da8e2
Show file tree
Hide file tree
Showing 12 changed files with 57 additions and 258 deletions.
2 changes: 1 addition & 1 deletion .github/dockerfiles/docker_tag
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pr-26588
pr-26586
14 changes: 7 additions & 7 deletions .github/dockerfiles/ov_build/fedora_29/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ RUN chmod +x /install_build_dependencies.sh && \

# Setup Python
RUN cd /usr/src && \
wget https://www.python.org/ftp/python/3.8.9/Python-3.8.9.tar.xz && \
tar xvf Python-3.8.9.tar.xz
RUN cd /usr/src/Python-3.8.9 && \
wget https://www.python.org/ftp/python/3.9.9/Python-3.9.9.tar.xz && \
tar xvf Python-3.9.9.tar.xz
RUN cd /usr/src/Python-3.9.9 && \
./configure --enable-optimizations --enable-loadable-sqlite-extensions --prefix=/usr && \
make altinstall

Expand All @@ -46,15 +46,15 @@ RUN mkdir ${SCCACHE_HOME} && cd ${SCCACHE_HOME} && \

ENV PATH="$SCCACHE_HOME:$PATH"

# Use Python 3.8 as default
RUN python3.8 -m venv venv
# Use Python 3.9 as default
RUN python3.9 -m venv venv
ENV PATH="/venv/bin:$PATH"
RUN alternatives --install /usr/bin/python python /usr/bin/python3.8 10
RUN alternatives --install /usr/bin/python python /usr/bin/python3.9 10

# Setup pip
ENV PIP_VERSION="24.0"
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python3.8 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
python3.9 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
rm -f get-pip.py

ENV PIP_CACHE_DIR=/mount/caches/pip/linux/${PIP_VERSION}
Expand Down
13 changes: 12 additions & 1 deletion .github/dockerfiles/ov_build/ubuntu_20_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# Pythons
python3.9-dev \
python3.9-venv \
python3.9-distutils \
# For Java API
default-jdk \
# Compiler \
Expand Down Expand Up @@ -51,10 +55,17 @@ RUN mkdir ${SCCACHE_HOME} && cd ${SCCACHE_HOME} && \
tar -xzf ${SCCACHE_ARCHIVE} --strip-components=1 && rm ${SCCACHE_ARCHIVE}

ENV PATH="$SCCACHE_HOME:$PATH"

# Setup pip
ENV PIP_VERSION="24.0"
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python3 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
python3 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
python3.9 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
rm -f get-pip.py

# Use Python 3.9 as default instead of Python 3.8
# Using venv here 'cause other methods to switch the default Python on Ubuntu 20 break both system and wheels build
RUN python3.9 -m venv venv
ENV PATH="/venv/bin:$SCCACHE_HOME:$PATH"

ENV PIP_CACHE_DIR=/mount/caches/pip/linux/${PIP_VERSION}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG REGISTRY="docker.io"
FROM ${REGISTRY}/library/fedora:32
FROM ${REGISTRY}/library/fedora:33

USER root

Expand Down
11 changes: 11 additions & 0 deletions .github/dockerfiles/ov_test/ubuntu_20_04_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ RUN apt-get update && \
git \
gpg-agent \
tzdata \
# Python
python3.9-dev \
python3.9-venv \
python3.9-distutils \
libhdf5-dev \
&& \
rm -rf /var/lib/apt/lists/*
Expand All @@ -36,6 +40,13 @@ RUN chmod +x /install_openvino_dependencies.sh && \
ENV PIP_VERSION="24.0"
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python3 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
python3.9 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
rm -f get-pip.py

# Use Python 3.9 as default instead of Python 3.8
# Using venv here 'cause other methods to switch the default Python on Ubuntu 20 break both system and wheels build
RUN python3.9 -m venv venv
ENV PATH="/venv/bin:$PATH"

ENV PIP_CACHE_DIR=/mount/caches/pip/linux/${PIP_VERSION}
ENV PIP_INSTALL_PATH=/venv/lib/python3.9/site-packages
6 changes: 3 additions & 3 deletions .github/workflows/fedora_29.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Fedora 29 (RHEL 8.4), Python 3.8
name: Fedora 29 (RHEL 8.4), Python 3.9
on:
workflow_dispatch:
pull_request:
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
with:
images: |
ov_build/fedora_29
ov_test/fedora_32
ov_test/fedora_33
registry: 'openvinogithubactions.azurecr.io'
dockerfiles_root_dir: '.github/dockerfiles'
changed_components: ${{ needs.smart_ci.outputs.changed_components }}
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
shell: bash
runs-on: aks-linux-4-cores-16gb
container:
image: ${{ fromJSON(needs.docker.outputs.images).ov_test.fedora_32 }}
image: ${{ fromJSON(needs.docker.outputs.images).ov_test.fedora_33 }}
env:
RPM_PACKAGES_DIR: /__w/openvino/packages/

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job_build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jobs:
${{ env.OPENVINO_REPO }}
${{ env.OPENVINO_CONTRIB_REPO }}
product_type: ${{ env.PRODUCT_TYPE }}
target_arch: 'intel64'
target_arch: ${{ inputs.arch }}
build_type: 'release'
save_to: ${{ env.MANIFEST_PATH }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job_build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
${{ env.OPENVINO_REPO }}
${{ env.OPENVINO_CONTRIB_REPO }}
product_type: ${{ env.PRODUCT_TYPE }}
target_arch: 'intel64'
target_arch: 'x86_64'
build_type: ${{ inputs.build-type }}
save_to: ${{ env.MANIFEST_PATH }}

Expand Down
Loading

0 comments on commit d4da8e2

Please sign in to comment.