From f5b81924d2006df0e4b61fbc63489e7848f9aa03 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Mon, 20 Jul 2020 13:20:59 -0500 Subject: [PATCH 1/5] Add Conda and Conda Examples jobs on Gitlab CI --- .gitlab-ci.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6aec221e..3a6d8fe5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,6 +99,28 @@ Python 3 Intel Examples: except: - tags +Python 3 Conda: + tags: + - docker-runner + script: | + sudo apt-get update + sudo apt-get install openmpi-bin libopenmpi-dev + CONDA_ENVIRONMENT=.test-conda-env-py3.yml + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh + . ./build-and-test-py-project-within-miniconda.sh + +Python 3 Conda Examples: + tags: + - docker-runner + script: | + sudo apt-get update + sudo apt-get install openmpi-bin libopenmpi-dev + CONDA_ENVIRONMENT=.test-conda-env-py3.yml + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + . ci-support.sh + build_py_project_in_conda_env + run_examples + Documentation: script: - EXTRA_INSTALL="pybind11 numpy" -- GitLab From 1e9604486d4b123c5b993756106f316ee68ac330 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Mon, 20 Jul 2020 14:37:16 -0500 Subject: [PATCH 2/5] Set hostname to avoid Gitlab runner issue --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a6d8fe5..c46d58e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,6 +105,8 @@ Python 3 Conda: script: | sudo apt-get update sudo apt-get install openmpi-bin libopenmpi-dev + # https://gitlab.com/gitlab-org/gitlab-runner/-/issues/26607 + sudo hostname gitlab-ci-runner CONDA_ENVIRONMENT=.test-conda-env-py3.yml curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh . ./build-and-test-py-project-within-miniconda.sh @@ -115,6 +117,8 @@ Python 3 Conda Examples: script: | sudo apt-get update sudo apt-get install openmpi-bin libopenmpi-dev + # https://gitlab.com/gitlab-org/gitlab-runner/-/issues/26607 + sudo hostname gitlab-ci-runner CONDA_ENVIRONMENT=.test-conda-env-py3.yml curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh . ci-support.sh -- GitLab From 048602893b7bd036307575a5cea3d40313954769 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Mon, 20 Jul 2020 14:44:17 -0500 Subject: [PATCH 3/5] Conda Gitlab CI: not in docker container --- .gitlab-ci.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c46d58e4..d6b09501 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,25 +100,13 @@ Python 3 Intel Examples: - tags Python 3 Conda: - tags: - - docker-runner script: | - sudo apt-get update - sudo apt-get install openmpi-bin libopenmpi-dev - # https://gitlab.com/gitlab-org/gitlab-runner/-/issues/26607 - sudo hostname gitlab-ci-runner CONDA_ENVIRONMENT=.test-conda-env-py3.yml curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh . ./build-and-test-py-project-within-miniconda.sh Python 3 Conda Examples: - tags: - - docker-runner script: | - sudo apt-get update - sudo apt-get install openmpi-bin libopenmpi-dev - # https://gitlab.com/gitlab-org/gitlab-runner/-/issues/26607 - sudo hostname gitlab-ci-runner CONDA_ENVIRONMENT=.test-conda-env-py3.yml curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh . ci-support.sh -- GitLab From ecf0af456c9462621a35ad00f191e0151cd5bee9 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Mon, 20 Jul 2020 15:06:03 -0500 Subject: [PATCH 4/5] Remove hwloc adjustment from conda env --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6b09501..3090b902 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,13 +101,15 @@ Python 3 Intel Examples: Python 3 Conda: script: | - CONDA_ENVIRONMENT=.test-conda-env-py3.yml + CONDA_ENVIRONMENT=.test-conda-env.yml + grep -v libhwloc .test-conda-env-py3.yml > $CONDA_ENVIRONMENT curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh . ./build-and-test-py-project-within-miniconda.sh Python 3 Conda Examples: script: | - CONDA_ENVIRONMENT=.test-conda-env-py3.yml + CONDA_ENVIRONMENT=.test-conda-env.yml + grep -v libhwloc .test-conda-env-py3.yml > $CONDA_ENVIRONMENT curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh . ci-support.sh build_py_project_in_conda_env -- GitLab From be42858959f4dab324cc82f03830a2d403f163ca Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Mon, 20 Jul 2020 16:02:50 -0500 Subject: [PATCH 5/5] Run Gitlab conda jobs on large Linux nodes --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3090b902..66fc4e49 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,6 +100,9 @@ Python 3 Intel Examples: - tags Python 3 Conda: + tags: + - linux + - large-node script: | CONDA_ENVIRONMENT=.test-conda-env.yml grep -v libhwloc .test-conda-env-py3.yml > $CONDA_ENVIRONMENT @@ -107,6 +110,9 @@ Python 3 Conda: . ./build-and-test-py-project-within-miniconda.sh Python 3 Conda Examples: + tags: + - linux + - large-node script: | CONDA_ENVIRONMENT=.test-conda-env.yml grep -v libhwloc .test-conda-env-py3.yml > $CONDA_ENVIRONMENT -- GitLab