From 8aadc3368729e2bcf143e98de55dd869f9df8faf Mon Sep 17 00:00:00 2001 From: Winterflower Date: Mon, 2 Dec 2019 17:18:40 +0100 Subject: [PATCH 1/2] Removes stripping of http from url --- eland/tests/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/eland/tests/__init__.py b/eland/tests/__init__.py index 36353f1..50e8930 100644 --- a/eland/tests/__init__.py +++ b/eland/tests/__init__.py @@ -6,7 +6,6 @@ ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) # Define test files and indices ELASTICSEARCH_HOST = os.environ.get('ELASTICSEARCH_HOST') or 'localhost' -ELASTICSEARCH_HOST = ELASTICSEARCH_HOST.lstrip('http://') FLIGHTS_INDEX_NAME = 'flights' FLIGHTS_MAPPING = {"mappings": { From 32cd181065624b2294849b3163c3ccd17cf2b9f8 Mon Sep 17 00:00:00 2001 From: Winterflower Date: Mon, 2 Dec 2019 17:22:34 +0100 Subject: [PATCH 2/2] Adds pull request CI job for eland --- .ci/jobs/elastic+eland+pull-request.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .ci/jobs/elastic+eland+pull-request.yml diff --git a/.ci/jobs/elastic+eland+pull-request.yml b/.ci/jobs/elastic+eland+pull-request.yml new file mode 100644 index 0000000..0249070 --- /dev/null +++ b/.ci/jobs/elastic+eland+pull-request.yml @@ -0,0 +1,19 @@ +--- +- job: + name: elastic+eland+pull-request + display-name: 'elastic / eland # pull-request' + description: Testing of eland pull requests. + scm: + - git: + branches: + - ${ghprbActualCommit} + refspec: +refs/pull/*:refs/remotes/origin/pr/* + triggers: + - github-pull-request: + org-list: + - elastic + allow-whitelist-orgs-as-admins: true + github-hooks: true + status-context: clients-ci + cancel-builds-on-update: true + publishers: [] \ No newline at end of file