You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2018/08/25 17:50:18 UTC
[GitHub] kaxil closed pull request #3780: [AIRFLOW-2933] Enable Codecov on
Docker-CI Build
kaxil closed pull request #3780: [AIRFLOW-2933] Enable Codecov on Docker-CI Build
URL: https://github.com/apache/incubator-airflow/pull/3780
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.codecov.yml b/.codecov.yml
deleted file mode 100644
index 4094f35dcc..0000000000
--- a/.codecov.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# keep default
diff --git a/.travis.yml b/.travis.yml
index 9c7cfd0208..5bd750453a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ cache:
before_install:
- sudo ls -lh $HOME/.cache/pip/
- sudo rm -rf $HOME/.cache/pip/* $HOME/.wheelhouse/*
- - sudo chown -R travis.travis $HOME/.cache/pip
+ - sudo chown -R travis:travis $HOME/.cache/pip
install:
# Use recent docker-compose version
- sudo rm /usr/local/bin/docker-compose
@@ -50,9 +50,5 @@ install:
- chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin
- pip install --upgrade pip
- - pip install codecov
script:
- docker-compose --log-level ERROR -f scripts/ci/docker-compose.yml run airflow-testing /app/scripts/ci/run-ci.sh
-after_success:
- - sudo chown -R travis.travis .
- - codecov
diff --git a/scripts/ci/docker-compose.yml b/scripts/ci/docker-compose.yml
index 861cf9e8b8..32e0a536c1 100644
--- a/scripts/ci/docker-compose.yml
+++ b/scripts/ci/docker-compose.yml
@@ -70,11 +70,17 @@ services:
- SLUGIFY_USES_TEXT_UNIDECODE=yes
- TOX_ENV
- PYTHON_VERSION
+ - CI
- TRAVIS
- TRAVIS_BRANCH
- TRAVIS_BUILD_DIR
- TRAVIS_JOB_ID
+ - TRAVIS_JOB_NUMBER
- TRAVIS_PULL_REQUEST
+ - TRAVIS_COMMIT
+ - TRAVIS_REPO_SLUG
+ - TRAVIS_OS_NAME
+ - TRAVIS_TAG
depends_on:
- postgres
- mysql
diff --git a/tox.ini b/tox.ini
index 73e3170ec8..c4b74a1e55 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,7 +33,7 @@ ignore = E731,W503
[testenv]
deps =
wheel
- coveralls
+ codecov
basepython =
py27: python2.7
@@ -52,18 +52,7 @@ setenv =
backend_sqlite: AIRFLOW__CORE__SQL_ALCHEMY_CONN=sqlite:///{homedir}/airflow.db
backend_sqlite: AIRFLOW__CORE__EXECUTOR=SequentialExecutor
-passenv =
- HOME
- JAVA_HOME
- USER
- PATH
- BOTO_CONFIG
- TRAVIS
- TRAVIS_BRANCH
- TRAVIS_BUILD_DIR
- TRAVIS_JOB_ID
- TRAVIS_PULL_REQUEST
- SLUGIFY_USES_TEXT_UNIDECODE
+passenv = *
commands =
pip wheel --progress-bar off -w {homedir}/.wheelhouse -f {homedir}/.wheelhouse -e .[devel_ci]
@@ -74,6 +63,7 @@ commands =
{toxinidir}/scripts/ci/4-load-data.sh
{toxinidir}/scripts/ci/5-run-tests.sh []
{toxinidir}/scripts/ci/6-check-license.sh
+ codecov -e TOXENV
[testenv:flake8]
basepython = python3
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services