From 9731de67322f756885568e595743c68450e4570b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Thu, 17 Jun 2021 06:11:59 +0000 Subject: [PATCH] Gitlab CI: switch POCL CUDA tests to natively installed, drop -k from curl --- .github/workflows/ci.yml | 16 ++++++------- .gitlab-ci.yml | 49 +++++++++++++++++++++------------------- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63a3bb0..e5d9acf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: python-version: '3.6' - name: "Main Script" run: | - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh + curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh . ./prepare-and-run-flake8.sh boxtree test examples pylint: @@ -33,7 +33,7 @@ jobs: sed 's/python=3/python=3.7/' .test-conda-env-py3.yml > .test-conda-env.yml CONDA_ENVIRONMENT=.test-conda-env.yml USE_CONDA_BUILD=1 - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-pylint.sh + curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-pylint.sh . ./prepare-and-run-pylint.sh boxtree test/test_*.py docs: @@ -48,8 +48,8 @@ jobs: - name: "Main Script" run: | CONDA_ENVIRONMENT=.test-conda-env-py3.yml - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh - . ci-support.sh + curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support-v0 + . ci-support-v0 build_py_project_in_conda_env build_docs @@ -62,7 +62,7 @@ jobs: run: | CONDA_ENVIRONMENT=.test-conda-env-py3.yml export MPLBACKEND=Agg - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh + curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh . ./build-and-test-py-project-within-miniconda.sh py3example: @@ -73,9 +73,9 @@ jobs: - name: "Main Script" run: | CONDA_ENVIRONMENT=.test-conda-env-py3.yml - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-py-project-within-miniconda.sh + curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-py-project-within-miniconda.sh . ./build-py-project-within-miniconda.sh - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/run-examples.sh + curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/run-examples.sh . ./run-examples.sh downstream_tests: @@ -97,7 +97,7 @@ jobs: export CONDA_ENVIRONMENT=.test-conda-env-py3.yml # Avoid slow or complicated tests in downstream projects export PYTEST_ADDOPTS="-k 'not (slowtest or octave or mpi)'" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh + curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh . ./ci-support.sh build_py_project_in_conda_env test_py_project diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 686ce41..33f8576 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ Python 3 POCL: - export PY_EXE=python3 - export PYOPENCL_TEST=portable:pthread - export EXTRA_INSTALL="pybind11 numpy mako matplotlib" - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh + - curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: - python3 @@ -15,12 +15,13 @@ Python 3 POCL: junit: test/pytest.xml Python 3 POCL Titan V: - script: - - export PYOPENCL_TEST=portable:titan - - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - - export MPLBACKEND=Agg - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh - - ". ./build-and-test-py-project-within-miniconda.sh" + script: | + export PYOPENCL_TEST=portable:titan + export MPLBACKEND=Agg + curl -L -O https://tiker.net/ci-support-v0 + . ./ci-support-v0 + build_py_project_in_venv + test_py_project tags: - nvidia-titan-v except: @@ -30,12 +31,13 @@ Python 3 POCL Titan V: junit: test/pytest.xml Python 3 POCL Titan X: - script: - - export PYOPENCL_TEST=portable:titan - - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - - export MPLBACKEND=Agg - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh - - ". ./build-and-test-py-project-within-miniconda.sh" + script: | + export PYOPENCL_TEST=portable:titan + export MPLBACKEND=Agg + curl -L -O https://tiker.net/ci-support-v0 + . ./ci-support-v0 + build_py_project_in_venv + test_py_project tags: - nvidia-titan-x except: @@ -45,12 +47,13 @@ Python 3 POCL Titan X: junit: test/pytest.xml Python 3 POCL K40: - script: - - export PYOPENCL_TEST=portable:k40 - - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - - export MPLBACKEND=Agg - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh - - ". ./build-and-test-py-project-within-miniconda.sh" + script: | + export PYOPENCL_TEST=portable:titan + export MPLBACKEND=Agg + curl -L -O https://tiker.net/ci-support-v0 + . ./ci-support-v0 + build_py_project_in_venv + test_py_project tags: - nvidia-k40 except: @@ -65,7 +68,7 @@ Python 3 POCL Examples: - export PY_EXE=python3 - export PYOPENCL_TEST=portable:pthread - export EXTRA_INSTALL="pybind11 numpy mako pyvisfile matplotlib" - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-py-project-and-run-examples.sh + - curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-py-project-and-run-examples.sh - ". ./build-py-project-and-run-examples.sh" tags: - python3 @@ -80,7 +83,7 @@ Pylint: script: - export PY_EXE=python3 - EXTRA_INSTALL="pybind11 numpy mako matplotlib" - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-pylint.sh + - curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-pylint.sh - ". ./prepare-and-run-pylint.sh boxtree test/test_*.py" tags: - python3 @@ -90,14 +93,14 @@ Pylint: Documentation: script: - EXTRA_INSTALL="pybind11 numpy mako" - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-docs.sh + - curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-docs.sh - ". ./build-docs.sh" tags: - python3 Flake8: script: - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh + - curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh - ". ./prepare-and-run-flake8.sh boxtree test examples" tags: - python3 -- GitLab