Repository: incubator-airflow Updated Branches: refs/heads/master f520990fe -> a15b7c5b7
[AIRFLOW-1314] Create integration testing environment Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/29daa58e Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/29daa58e Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/29daa58e Branch: refs/heads/master Commit: 29daa58ec04249c3689a1619730413ecfe6ab619 Parents: bb1e05c Author: dimberman <[email protected]> Authored: Wed Sep 6 15:52:56 2017 -0700 Committer: Fokko Driesprong <[email protected]> Committed: Sun Apr 22 10:17:39 2018 +0200 ---------------------------------------------------------------------- airflow/bin/cli/cli_factory.py | 2 ++ airflow/contrib/executors/kubernetes_executor.py | 2 +- tst.txt | 0 3 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/29daa58e/airflow/bin/cli/cli_factory.py ---------------------------------------------------------------------- diff --git a/airflow/bin/cli/cli_factory.py b/airflow/bin/cli/cli_factory.py index 46efcf7..167643b 100644 --- a/airflow/bin/cli/cli_factory.py +++ b/airflow/bin/cli/cli_factory.py @@ -1,6 +1,8 @@ from collections import namedtuple from cli import * from dateutil.parser import parse as parsedate +from airflow import settings +from airflow import conf Arg = namedtuple( http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/29daa58e/airflow/contrib/executors/kubernetes_executor.py ---------------------------------------------------------------------- diff --git a/airflow/contrib/executors/kubernetes_executor.py b/airflow/contrib/executors/kubernetes_executor.py index 5e4afba..63aa696 100644 --- a/airflow/contrib/executors/kubernetes_executor.py +++ b/airflow/contrib/executors/kubernetes_executor.py @@ -102,7 +102,7 @@ class AirflowKubernetesScheduler(object): self.logger.info("running for command {}".format(command)) cmd_args = "mkdir -p $AIRFLOW_HOME/dags/synched/git && cd $AIRFLOW_HOME/dags/synched/git &&" \ "git init && git remote add origin {git_repo} && git pull origin {git_branch} --depth=1 &&" \ - "{command} -km".format(git_repo=self.kube_config.git_repo, git_branch=self.kube_config.git_branch, + "{command}".format(git_repo=self.kube_config.git_repo, git_branch=self.kube_config.git_branch, command=command) pod_id = self._create_job_id_from_key(key=key) pod = KubernetesPodBuilder( http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/29daa58e/tst.txt ---------------------------------------------------------------------- diff --git a/tst.txt b/tst.txt new file mode 100644 index 0000000..e69de29
