diff --git a/Jenkinsfile.sh b/Jenkinsfile.sh index 710acdc..870f2b6 100644 --- a/Jenkinsfile.sh +++ b/Jenkinsfile.sh @@ -18,29 +18,19 @@ docker build -f ${WORKSPACE_ROOT}/projects/tricolour/docker/python310.docker -t tar xvf $TEST_DATA_DIR/acceptance_test_data.tar.gz -C $TEST_OUTPUT_DIR TEST_MS_REL=1519747221.subset.ms -# test 3.6 +# test 3.8 docker run \ --rm \ -v $TEST_OUTPUT_DIR:/testdata \ --env TRICOLOUR_TEST_MS=/testdata/$TEST_MS_REL \ --workdir /code \ --entrypoint /bin/sh \ - tricolour.1804.py36:${BUILD_NUMBER} \ + tricolour.2004.py38:${BUILD_NUMBER} \ -c "python3 -m pytest --flake8 -s -vvv ." rm -rf $TEST_OUTPUT_DIR/TEST_MS_REL tar xvf $TEST_DATA_DIR/acceptance_test_data.tar.gz -C $TEST_OUTPUT_DIR -# test 3.8 -docker run \ - --rm \ - -v $TEST_OUTPUT_DIR:/testdata \ - --env TRICOLOUR_TEST_MS=/testdata/$TEST_MS_REL \ - --workdir /code \ - --entrypoint /bin/sh \ - tricolour.2004.py38:${BUILD_NUMBER} \ - -c "python3 -m pytest --flake8 -s -vvv ." - # test 3.10 docker run \ --rm \ @@ -49,4 +39,4 @@ docker run \ --workdir /code \ --entrypoint /bin/sh \ tricolour.2204.py310:${BUILD_NUMBER} \ - -c "python3 -m pytest --flake8 -s -vvv ." \ No newline at end of file + -c "python3 -m pytest --flake8 -s -vvv ." diff --git a/docker/python36.docker b/docker/python36.docker deleted file mode 100644 index 899b5d5..0000000 --- a/docker/python36.docker +++ /dev/null @@ -1,19 +0,0 @@ -FROM kernsuite/base:6 - -# Install base requirements -RUN docker-apt-install python3-pip \ - build-essential \ - cmake \ - casacore-dev \ - python-numpy \ - python-setuptools \ - libboost-python-dev \ - libcfitsio-dev \ - wcslib-dev - -RUN pip3 install --upgrade pip setuptools -ADD . /code -WORKDIR /code - -# Install base + testing packages -RUN pip3 install .[testing] \ No newline at end of file