Commit fbdae09e authored by André Anjos's avatar André Anjos 💬 Committed by Samuel GAIST

[ci/conda] Remove docker specific stage

Now all tests are run on the build stages
parent 62bb0f6e
...@@ -9,7 +9,6 @@ variables: ...@@ -9,7 +9,6 @@ variables:
# Definition of our build pipeline order # Definition of our build pipeline order
stages: stages:
- build - build
- docker
- deploy - deploy
- pypi - pypi
...@@ -63,23 +62,6 @@ stages: ...@@ -63,23 +62,6 @@ stages:
key: "macosx-cache" key: "macosx-cache"
# Docker host based testing (must be run inside dind or docker-enabled host)
.docker_test_linux_template: &linux_docker_job
stage: docker
before_script:
# safe keep artifacts as before_build.sh will erase those...
- mv ${CONDA_ROOT}/conda-bld .
- ./_ci/install.sh _ci master #updates ci support scripts
- ./_ci/before_build.sh
- mv conda-bld ${CONDA_ROOT}
- ./scripts/before_test.sh
script:
- export BEAT_DOCKER_TESTS=true
- BOB_TEST_ONLY=true ./_ci/build.sh
after_script:
- ./_ci/after_build.sh
build_linux_36: build_linux_36:
<<: *linux_build_job <<: *linux_build_job
variables: variables:
...@@ -100,17 +82,6 @@ build_macosx_36: ...@@ -100,17 +82,6 @@ build_macosx_36:
PYTHON_VERSION: "3.6" PYTHON_VERSION: "3.6"
# Docker host based testing
docker_linux_36:
<<: *linux_docker_job
variables:
PYTHON_VERSION: "3.6"
dependencies:
- build_linux_36
tags:
- docker-build
# Deploy targets # Deploy targets
.deploy_template: &deploy_job .deploy_template: &deploy_job
stage: deploy stage: deploy
......
...@@ -53,10 +53,9 @@ test: ...@@ -53,10 +53,9 @@ test:
commands: commands:
- worker --help - worker --help
- if [ -n "${BEAT_DOCKER_TESTS}" ]; then nosetests --with-coverage --cover-package={{ name }} -sv {{ name }}; fi - nosetests --with-coverage --cover-package={{ name }} -sv {{ name }}
- if [ -z "${BEAT_DOCKER_TESTS}" ]; then nosetests --with-coverage --cover-package={{ name }} -sv {{ name }} --exclude=".*test_docker.*"; fi - sphinx-build -aEW {{ project_dir }}/doc {{ project_dir }}/sphinx
- if [ -z "${BEAT_DOCKER_TESTS}" ]; then sphinx-build -aEW {{ project_dir }}/doc {{ project_dir }}/sphinx; fi - sphinx-build -aEb doctest {{ project_dir }}/doc sphinx
- if [ -z "${BEAT_DOCKER_TESTS}" ]; then sphinx-build -aEb doctest {{ project_dir }}/doc sphinx; fi
- conda inspect linkages -p $PREFIX {{ name }} # [not win] - conda inspect linkages -p $PREFIX {{ name }} # [not win]
- conda inspect objects -p $PREFIX {{ name }} # [osx] - conda inspect objects -p $PREFIX {{ name }} # [osx]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment