From bb161d2304c08c034cd13de3f016f5cf287f9ec3 Mon Sep 17 00:00:00 2001 From: ANGELOS TSALAPATIS Date: Thu, 14 Nov 2024 12:07:26 +0200 Subject: [PATCH] Remove test stages for python eol versions --- Jenkinsfile | 51 ------------------- pyhandle/tests/testdockers/Dockerfile-py3.10 | 5 +- pyhandle/tests/testdockers/Dockerfile-py3.11 | 5 +- pyhandle/tests/testdockers/Dockerfile-py3.5 | 16 ------ pyhandle/tests/testdockers/Dockerfile-py3.6 | 15 ------ pyhandle/tests/testdockers/Dockerfile-py3.7 | 15 ------ .../tests/testdockers/Dockerfile-python2.6 | 24 --------- 7 files changed, 6 insertions(+), 125 deletions(-) delete mode 100644 pyhandle/tests/testdockers/Dockerfile-py3.5 delete mode 100644 pyhandle/tests/testdockers/Dockerfile-py3.6 delete mode 100644 pyhandle/tests/testdockers/Dockerfile-py3.7 delete mode 100644 pyhandle/tests/testdockers/Dockerfile-python2.6 diff --git a/Jenkinsfile b/Jenkinsfile index 09a521e..e98a3a7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,57 +10,6 @@ pipeline { } stages { - stage ('Test python 3.5') { - agent { - dockerfile { - filename "pyhandle/tests/testdockers/Dockerfile-py3.5" - dir "$PROJECT_DIR" - additionalBuildArgs "-t eudat-pyhandle:py3.5" - args "-u root:root" - } - } - steps { - sh ''' - cd $WORKSPACE/$PROJECT_DIR/pyhandle/tests - ./docker-entrypoint.sh coverage - ''' - cobertura coberturaReportFile: '**/coverage.xml' - } - } - stage ('Test python 3.6') { - agent { - dockerfile { - filename "pyhandle/tests/testdockers/Dockerfile-py3.6" - dir "$PROJECT_DIR" - additionalBuildArgs "-t eudat-pyhandle:py3.6" - args "-u root:root" - } - } - steps { - sh ''' - cd $WORKSPACE/$PROJECT_DIR/pyhandle/tests - ./docker-entrypoint.sh coverage - ''' - cobertura coberturaReportFile: '**/coverage.xml' - } - } - stage ('Test python 3.7') { - agent { - dockerfile { - filename "pyhandle/tests/testdockers/Dockerfile-py3.7" - dir "$PROJECT_DIR" - additionalBuildArgs "-t eudat-pyhandle:py3.7" - args "-u root:root" - } - } - steps { - sh ''' - cd $WORKSPACE/$PROJECT_DIR/pyhandle/tests - ./docker-entrypoint.sh coverage - ''' - cobertura coberturaReportFile: '**/coverage.xml' - } - } stage ('Test python 3.9') { agent { dockerfile { diff --git a/pyhandle/tests/testdockers/Dockerfile-py3.10 b/pyhandle/tests/testdockers/Dockerfile-py3.10 index 706da05..2f404c5 100644 --- a/pyhandle/tests/testdockers/Dockerfile-py3.10 +++ b/pyhandle/tests/testdockers/Dockerfile-py3.10 @@ -8,8 +8,9 @@ RUN chown -R jenkins:jenkins /home/jenkins RUN pip install \ mock \ pytest \ - pytest-cov \ - pip install -U sphinx + pytest-cov + +RUN pip install -U sphinx ADD . /opt/PYHANDLE RUN cd /opt/PYHANDLE && \ diff --git a/pyhandle/tests/testdockers/Dockerfile-py3.11 b/pyhandle/tests/testdockers/Dockerfile-py3.11 index 32e1a95..d5384dd 100644 --- a/pyhandle/tests/testdockers/Dockerfile-py3.11 +++ b/pyhandle/tests/testdockers/Dockerfile-py3.11 @@ -8,8 +8,9 @@ RUN chown -R jenkins:jenkins /home/jenkins RUN pip install \ mock \ pytest \ - pytest-cov \ - pip install -U sphinx + pytest-cov + +RUN pip install -U sphinx ADD . /opt/PYHANDLE RUN cd /opt/PYHANDLE && \ diff --git a/pyhandle/tests/testdockers/Dockerfile-py3.5 b/pyhandle/tests/testdockers/Dockerfile-py3.5 deleted file mode 100644 index bda60dd..0000000 --- a/pyhandle/tests/testdockers/Dockerfile-py3.5 +++ /dev/null @@ -1,16 +0,0 @@ -# vim:set ft=dockerfile: -FROM python:3.5 - -RUN pip install \ - mock \ - coverage \ - chardet \ - nose - -ADD . /opt/PYHANDLE -RUN cd /opt/PYHANDLE && \ - python setup.py install - -WORKDIR /opt/PYHANDLE/pyhandle/tests - -CMD ["./docker-entrypoint.sh", "coverage"] diff --git a/pyhandle/tests/testdockers/Dockerfile-py3.6 b/pyhandle/tests/testdockers/Dockerfile-py3.6 deleted file mode 100644 index 53ea43c..0000000 --- a/pyhandle/tests/testdockers/Dockerfile-py3.6 +++ /dev/null @@ -1,15 +0,0 @@ -# vim:set ft=dockerfile: -FROM python:3.6 - -RUN pip install \ - mock \ - coverage \ - nose - -ADD . /opt/PYHANDLE -RUN cd /opt/PYHANDLE && \ - python setup.py install - -WORKDIR /opt/PYHANDLE/pyhandle/tests - -CMD ["./docker-entrypoint.sh", "coverage"] diff --git a/pyhandle/tests/testdockers/Dockerfile-py3.7 b/pyhandle/tests/testdockers/Dockerfile-py3.7 deleted file mode 100644 index b741ca3..0000000 --- a/pyhandle/tests/testdockers/Dockerfile-py3.7 +++ /dev/null @@ -1,15 +0,0 @@ -# vim:set ft=dockerfile: -FROM python:3.7 - -RUN pip install \ - mock \ - coverage \ - nose - -ADD . /opt/PYHANDLE -RUN cd /opt/PYHANDLE && \ - python setup.py install - -WORKDIR /opt/PYHANDLE/pyhandle/tests - -CMD ["./docker-entrypoint.sh", "coverage"] diff --git a/pyhandle/tests/testdockers/Dockerfile-python2.6 b/pyhandle/tests/testdockers/Dockerfile-python2.6 deleted file mode 100644 index b2c8214..0000000 --- a/pyhandle/tests/testdockers/Dockerfile-python2.6 +++ /dev/null @@ -1,24 +0,0 @@ -# vim:set ft=dockerfile: -FROM eudat-pyhandle:python2.6 - -RUN easy_install pip -RUN easy_install wget -RUN wget https://bootstrap.pypa.io/get-pip.py -RUN python get-pip.py -RUN pip install -U pip setuptools -RUN pip install \ - argparse \ - unittest2 \ - mock \ - coverage \ - nose - -VOLUME /opt/PYHANDLE/pyhandle/tests - -WORKDIR /opt/PYHANDLE/pyhandle/tests - -COPY docker-entrypoint.sh ./ - -ENTRYPOINT ["./docker-entrypoint.sh"] - -CMD ["coverage"]