From 23a5052ceed35f1222f0bf1e9319847273466d2c Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Wed, 25 Jul 2018 12:16:27 +0200 Subject: [PATCH 1/7] Add a comment, move echo to before_script step. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c5fbb9b23d..48afc5b5a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ branches: env: global: - CACHE_NAME=JOB1 + # NOTE: We only enable coverage for master builds and not pull requests + # since it has huge performance overhead (etests are 50% or so slower) - ENABLE_COVERAGE=$([ "${TRAVIS_PULL_REQUEST}" = "false" ] && echo "yes" || echo "no") matrix: include: @@ -64,7 +66,6 @@ before_install: - sudo pip install --upgrade "virtualenv==15.1.0" install: - - "echo ${ENABLE_COVERAGE}" - if [ "${TASK}" = 'compilepy3 ci-py3-unit' ] || [ "${TASK}" = 'ci-py3-integration' ]; then pip install "tox==3.0.0"; else make requirements; fi - if [ "${TASK}" = 'ci-unit' ] || [ "${TASK}" = 'ci-integration' ] && [ "${ENABLE_COVERAGE}" = 'yes' ]; then pip install codecov; fi - if [ "${TASK}" = 'ci-unit' ] || [ "${TASK}" = 'ci-integration' ] || [ "${TASK}" = 'compilepy3 ci-py3-unit' ] || [ "${TASK}" = 'ci-py3-integration' ]; then sudo .circle/add-itest-user.sh; fi @@ -72,6 +73,7 @@ install: # Let's enable rabbitmqadmin # See https://github.com/messagebus/lapine/wiki/Testing-on-Travis. before_script: + - "echo ENABLE_COVERAGE=${ENABLE_COVERAGE}" - git --version - pip --version - virtualenv --version From 769832d22c32c7f3cc892f45fcb6f9e9f4717a01 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Wed, 25 Jul 2018 12:47:23 +0200 Subject: [PATCH 2/7] Temporary use my fork which will allow to more easily debug the issues. --- .travis.yml | 2 +- Makefile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 48afc5b5a4..00a449827f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ before_install: install: - if [ "${TASK}" = 'compilepy3 ci-py3-unit' ] || [ "${TASK}" = 'ci-py3-integration' ]; then pip install "tox==3.0.0"; else make requirements; fi - - if [ "${TASK}" = 'ci-unit' ] || [ "${TASK}" = 'ci-integration' ] && [ "${ENABLE_COVERAGE}" = 'yes' ]; then pip install codecov; fi + - if [ "${TASK}" = 'ci-unit' ] || [ "${TASK}" = 'ci-integration' ] && [ "${ENABLE_COVERAGE}" = 'yes' ]; then pip install -e "https://github.com/Kami/codecov-python.git@better_error_output#egg=codecov"; fi - if [ "${TASK}" = 'ci-unit' ] || [ "${TASK}" = 'ci-integration' ] || [ "${TASK}" = 'compilepy3 ci-py3-unit' ] || [ "${TASK}" = 'ci-py3-integration' ]; then sudo .circle/add-itest-user.sh; fi # Let's enable rabbitmqadmin diff --git a/Makefile b/Makefile index 14bf4a43ba..31b079a780 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,8 @@ COMPONENTS_TEST_MODULES_COMMA := $(subst $(space_char),$(comma),$(COMPONENTS_TES COVERAGE_GLOBS := .coverage.unit.* .coverage.integration.* .coverage.mistral.* COVERAGE_GLOBS_QUOTED := $(foreach glob,$(COVERAGE_GLOBS),'$(glob)') +COMPONENTS_TEST = "st2debug" + PYTHON_TARGET := 2.7 REQUIREMENTS := test-requirements.txt requirements.txt From 7694cc233f00165c92e96ea7e68c3ee5bde85185 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Wed, 25 Jul 2018 12:49:56 +0200 Subject: [PATCH 3/7] Fix typo. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 00a449827f..bd7d50aec0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ before_install: install: - if [ "${TASK}" = 'compilepy3 ci-py3-unit' ] || [ "${TASK}" = 'ci-py3-integration' ]; then pip install "tox==3.0.0"; else make requirements; fi - - if [ "${TASK}" = 'ci-unit' ] || [ "${TASK}" = 'ci-integration' ] && [ "${ENABLE_COVERAGE}" = 'yes' ]; then pip install -e "https://github.com/Kami/codecov-python.git@better_error_output#egg=codecov"; fi + - if [ "${TASK}" = 'ci-unit' ] || [ "${TASK}" = 'ci-integration' ] && [ "${ENABLE_COVERAGE}" = 'yes' ]; then pip install -e "git+https://github.com/Kami/codecov-python.git@better_error_output#egg=codecov"; fi - if [ "${TASK}" = 'ci-unit' ] || [ "${TASK}" = 'ci-integration' ] || [ "${TASK}" = 'compilepy3 ci-py3-unit' ] || [ "${TASK}" = 'ci-py3-integration' ]; then sudo .circle/add-itest-user.sh; fi # Let's enable rabbitmqadmin From 031d713317ab9ad1b69dfbecf7b613057e435ba2 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Wed, 25 Jul 2018 12:51:35 +0200 Subject: [PATCH 4/7] Temporary enable coverage so i can test coveralls reporting. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bd7d50aec0..75a6c3f53c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,8 @@ env: - CACHE_NAME=JOB1 # NOTE: We only enable coverage for master builds and not pull requests # since it has huge performance overhead (etests are 50% or so slower) - - ENABLE_COVERAGE=$([ "${TRAVIS_PULL_REQUEST}" = "false" ] && echo "yes" || echo "no") + #- ENABLE_COVERAGE=$([ "${TRAVIS_PULL_REQUEST}" = "false" ] && echo "yes" || echo "no") + - ENABLE_COVERAGE=yes matrix: include: - env: TASK=ci-unit NODE_INDEX=0 NODE_TOTAL=2 From 7c40ecd5a69282feb18ee959fe2211eea6c9e166 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Wed, 25 Jul 2018 13:08:38 +0200 Subject: [PATCH 5/7] Install eventlet library which is needed for "coverage combine" step to work. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 75a6c3f53c..17ba9b5d9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,9 @@ before_install: install: - if [ "${TASK}" = 'compilepy3 ci-py3-unit' ] || [ "${TASK}" = 'ci-py3-integration' ]; then pip install "tox==3.0.0"; else make requirements; fi - - if [ "${TASK}" = 'ci-unit' ] || [ "${TASK}" = 'ci-integration' ] && [ "${ENABLE_COVERAGE}" = 'yes' ]; then pip install -e "git+https://github.com/Kami/codecov-python.git@better_error_output#egg=codecov"; fi + # NOTE: We need eventlet installed so coverage can be correctly combined. This is needed because we are covering code which utilizes eventlet. + # Without eventlet being available to to coverage command it will fail with "Couldn't trace with concurrency=eventlet, the module isn't installed." + - if [ "${TASK}" = 'ci-unit' ] || [ "${TASK}" = 'ci-integration' ] && [ "${ENABLE_COVERAGE}" = 'yes' ]; then pip install eventlet ; pip install -e "git+https://github.com/Kami/codecov-python.git@better_error_output#egg=codecov"; fi - if [ "${TASK}" = 'ci-unit' ] || [ "${TASK}" = 'ci-integration' ] || [ "${TASK}" = 'compilepy3 ci-py3-unit' ] || [ "${TASK}" = 'ci-py3-integration' ]; then sudo .circle/add-itest-user.sh; fi # Let's enable rabbitmqadmin From 66675e5bbc258ab8bfa7caf79886597ad144ec14 Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Wed, 25 Jul 2018 13:13:04 +0200 Subject: [PATCH 6/7] Remove debug stuff, coverage submission to coveralls is working again. --- .travis.yml | 3 +-- Makefile | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17ba9b5d9f..e37107c55f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,7 @@ env: - CACHE_NAME=JOB1 # NOTE: We only enable coverage for master builds and not pull requests # since it has huge performance overhead (etests are 50% or so slower) - #- ENABLE_COVERAGE=$([ "${TRAVIS_PULL_REQUEST}" = "false" ] && echo "yes" || echo "no") - - ENABLE_COVERAGE=yes + - ENABLE_COVERAGE=$([ "${TRAVIS_PULL_REQUEST}" = "false" ] && echo "yes" || echo "no") matrix: include: - env: TASK=ci-unit NODE_INDEX=0 NODE_TOTAL=2 diff --git a/Makefile b/Makefile index 31b079a780..14bf4a43ba 100644 --- a/Makefile +++ b/Makefile @@ -42,8 +42,6 @@ COMPONENTS_TEST_MODULES_COMMA := $(subst $(space_char),$(comma),$(COMPONENTS_TES COVERAGE_GLOBS := .coverage.unit.* .coverage.integration.* .coverage.mistral.* COVERAGE_GLOBS_QUOTED := $(foreach glob,$(COVERAGE_GLOBS),'$(glob)') -COMPONENTS_TEST = "st2debug" - PYTHON_TARGET := 2.7 REQUIREMENTS := test-requirements.txt requirements.txt From 26ab4e47d48873ebef13dbab1ff700a3303cfe6b Mon Sep 17 00:00:00 2001 From: Tomaz Muraus Date: Wed, 25 Jul 2018 13:17:03 +0200 Subject: [PATCH 7/7] Fix typo. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e37107c55f..556118eea4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ before_install: install: - if [ "${TASK}" = 'compilepy3 ci-py3-unit' ] || [ "${TASK}" = 'ci-py3-integration' ]; then pip install "tox==3.0.0"; else make requirements; fi # NOTE: We need eventlet installed so coverage can be correctly combined. This is needed because we are covering code which utilizes eventlet. - # Without eventlet being available to to coverage command it will fail with "Couldn't trace with concurrency=eventlet, the module isn't installed." + # Without eventlet being available to the coverage command it will fail with "Couldn't trace with concurrency=eventlet, the module isn't installed." - if [ "${TASK}" = 'ci-unit' ] || [ "${TASK}" = 'ci-integration' ] && [ "${ENABLE_COVERAGE}" = 'yes' ]; then pip install eventlet ; pip install -e "git+https://github.com/Kami/codecov-python.git@better_error_output#egg=codecov"; fi - if [ "${TASK}" = 'ci-unit' ] || [ "${TASK}" = 'ci-integration' ] || [ "${TASK}" = 'compilepy3 ci-py3-unit' ] || [ "${TASK}" = 'ci-py3-integration' ]; then sudo .circle/add-itest-user.sh; fi