From 3262f87e9500334119c94812ae4ae29f5cb91890 Mon Sep 17 00:00:00 2001 From: u214892 <u214892@sbb.ch> Date: Wed, 6 Nov 2019 11:25:32 -0500 Subject: [PATCH] #264 separate profiling and benchmarks in nightly builds to hopefully stay below the 60 minutes marks for jobs in gitlab --- .gitlab-ci.yml | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 698ceca1..8aeb6fca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,8 @@ image: themattrix/tox stages: - tests - integration_testing - - benchmarks_and_profiling + - profiling + - benchmarks - deploy_docs cache: paths: @@ -61,10 +62,10 @@ build_and_deploy_docs: name: ${CI_COMMIT_REF_SLUG} url: http://${BUCKET_NAME}.s3-website.${AWS_DEFAULT_REGION}.amazonaws.com/ -benchmarks_and_profiling: +profiling: dependencies: - tests - stage: benchmarks_and_profiling + stage: profiling only: variables: - $BENCHMARKS_AND_PROFILING @@ -78,7 +79,26 @@ benchmarks_and_profiling: - conda update -n root conda -y - conda install -c conda-forge tox-conda script: - - xvfb-run tox -e benchmarks,profiling -v --recreate + - xvfb-run tox -e profiling -v --recreate + +benchmarks: + dependencies: + - tests + stage: benchmarks + only: + variables: + - $BENCHMARKS_AND_PROFILING + before_script: + - apt update + - apt install -y libgl1-mesa-glx xvfb xdg-utils libcairo2-dev libjpeg-dev libgif-dev + - wget -nv https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /tmp/Miniconda3-latest-Linux-x86_64.sh + - bash /tmp/Miniconda3-latest-Linux-x86_64.sh -b -p /tmp/miniconda3 + - export PATH=/tmp/miniconda3/bin:$PATH + - pip install tox awscli + - conda update -n root conda -y + - conda install -c conda-forge tox-conda + script: + - xvfb-run tox -e benchmarks -v --recreate test_conda_setup: stage: integration_testing -- GitLab