Skip to content

Commit

Permalink
[AIRFLOW-5680] Fixes Kubernetes hangs (apache#6347)
Browse files Browse the repository at this point in the history
  • Loading branch information
potiuk authored and mik-laj committed Oct 19, 2019
1 parent b8c0263 commit c19a60c
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
42 changes: 21 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,6 @@ stages:
- test
jobs:
include:
- name: "Tests postgres python 3.6"
env: BACKEND=postgres ENV=docker
python: "3.6"
stage: test
- name: "Tests sqlite python 3.5"
env: BACKEND=sqlite ENV=docker
python: "3.5"
stage: test
- name: "Tests mysql python 3.7"
env: BACKEND=mysql ENV=docker
python: "3.7"
stage: test
- name: "Tests postgres kubernetes python 3.6 (persistent)"
env: BACKEND=postgres ENV=kubernetes KUBERNETES_VERSION=v1.15.0 KUBERNETES_MODE=persistent_mode
python: "3.6"
stage: test
- name: "Tests postgres kubernetes python 3.6 (git)"
env: BACKEND=postgres ENV=kubernetes KUBERNETES_VERSION=v1.15.0 KUBERNETES_MODE=git_mode
python: "3.6"
stage: test
- name: "Static checks (no pylint, no licence check)"
stage: pre-test
script: ./scripts/ci/ci_run_all_static_tests_except_pylint_licence.sh
Expand All @@ -63,8 +43,28 @@ jobs:
- name: "Build documentation"
stage: pre-test
script: ./scripts/ci/ci_docs.sh
- name: "Tests postgres kubernetes python 3.6 (persistent)"
env: BACKEND=postgres ENV=kubernetes KUBERNETES_VERSION=v1.15.0 KUBERNETES_MODE=persistent_mode
python: "3.6"
stage: test
- name: "Tests postgres kubernetes python 3.6 (git)"
env: BACKEND=postgres ENV=kubernetes KUBERNETES_VERSION=v1.15.0 KUBERNETES_MODE=git_mode
python: "3.6"
stage: test
- name: "Tests postgres python 3.6"
env: BACKEND=postgres ENV=docker
python: "3.6"
stage: test
- name: "Tests sqlite python 3.5"
env: BACKEND=sqlite ENV=docker
python: "3.5"
stage: test
- name: "Tests mysql python 3.7"
env: BACKEND=mysql ENV=docker
python: "3.7"
stage: test
services:
- docker
before_install:
- ./scripts/ci/ci_before_install.sh
script: "./scripts/ci/ci_run_airflow_testing.sh"
script: travis_wait 30 "./scripts/ci/ci_run_airflow_testing.sh"
2 changes: 1 addition & 1 deletion airflow/kubernetes/k8s_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
"""
Classes for interacting with Kubernetes API
Classes for interacting with Kubernetes API.
"""

from abc import ABC, abstractmethod
Expand Down

0 comments on commit c19a60c

Please sign in to comment.