[AIRFLOW-1517] Kubernetes operator PR fixes Fix python flake8 linting issues and AIRFLOW license issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/7fb5906e Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/7fb5906e Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/7fb5906e Branch: refs/heads/master Commit: 7fb5906e68fdf351e97acbf04f334b2a86081e81 Parents: d5b13a3 Author: GRANT NICHOLAS <[email protected]> Authored: Thu Jan 11 16:24:23 2018 -0600 Committer: Daniel Imberman <[email protected]> Committed: Thu Jan 11 15:29:34 2018 -0800 ---------------------------------------------------------------------- scripts/ci/kubernetes/minikube/start_minikube.sh | 3 +-- tests/contrib/minikube_tests/test_kubernetes_pod_operator.py | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/7fb5906e/scripts/ci/kubernetes/minikube/start_minikube.sh ---------------------------------------------------------------------- diff --git a/scripts/ci/kubernetes/minikube/start_minikube.sh b/scripts/ci/kubernetes/minikube/start_minikube.sh index 349b210..be370cf 100755 --- a/scripts/ci/kubernetes/minikube/start_minikube.sh +++ b/scripts/ci/kubernetes/minikube/start_minikube.sh @@ -1,4 +1,3 @@ -#!/usr/bin/env bash # 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 @@ -48,7 +47,7 @@ start_minikube(){ do echo "------- Running kubectl get pods -------" STDERR=$(kubectl get pods 2>&1 >/dev/null) - if [ $? -ne 1 ]; then + if [ $? -eq 0 ]; then echo $STDERR # We do not need dynamic hostpath provisioning, so disable the default storageclass http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/7fb5906e/tests/contrib/minikube_tests/test_kubernetes_pod_operator.py ---------------------------------------------------------------------- diff --git a/tests/contrib/minikube_tests/test_kubernetes_pod_operator.py b/tests/contrib/minikube_tests/test_kubernetes_pod_operator.py index a9a8e97..4bbde8f 100644 --- a/tests/contrib/minikube_tests/test_kubernetes_pod_operator.py +++ b/tests/contrib/minikube_tests/test_kubernetes_pod_operator.py @@ -19,16 +19,17 @@ import unittest from airflow.contrib.operators.kubernetes_pod_operator import KubernetesPodOperator from airflow import AirflowException from subprocess import check_call -import logging try: check_call(["kubectl", "get", "pods"]) except Exception as e: raise unittest.SkipTest( - "Kubernetes integration tests require a minikube cluster; Skipping tests {}".format(e) + "Kubernetes integration tests require a minikube cluster;" + "Skipping tests {}".format(e) ) + class KubernetesPodOperatorTest(unittest.TestCase): def test_working_pod(self):
