Skip to content

[DOCS] Defined es-test-dir in index.asciidoc. #25232

Merged
debadair merged 2 commits intoelastic:masterfrom
debadair:master
Jun 15, 2017
Merged

[DOCS] Defined es-test-dir in index.asciidoc. #25232
debadair merged 2 commits intoelastic:masterfrom
debadair:master

Conversation

@debadair
Copy link
Copy Markdown
Contributor

Use this attribute when specifying the location of included tests.

I also updated the existing test paths.

@nik9000 added you as a reviewer since you're the only one who's using test includes so far. Mostly just want you to know I'm adding the attribute.

@debadair debadair requested review from lcawl and nik9000 June 14, 2017 21:52
Copy link
Copy Markdown
Member

@nik9000 nik9000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine by me. I'd probably call it test-resources. I don't think es needs to be in the name because these resources are only for the docs not the rest of ES.

@lcawl
Copy link
Copy Markdown
Contributor

lcawl commented Jun 14, 2017

When I added that variable in the index*.asciidoc files in https://github.com/elastic/x-pack-elasticsearch/pull/1722 it reduced the errors, however I still get the following:

Lisas-MBP:GitRepo lcawley$ buildxesall
*** USING lcawley-xes BRANCH ***
Building HTML from elasticsearch-extra/x-pack-elasticsearch/docs/en/index-all.asciidoc
asciidoc: ERROR: Extracting tag `expert_engine` from file `/Users/lcawley/GitRepo/elasticsearch-extra/x-pack-elasticsearch/docs/en/../../plugins/examples/script-expert-scoring/src/main/java/org/elasticsearch/example/expertscript/ExpertScriptPlugin.java`: [Errno 2] No such file or directory: '/Users/lcawley/GitRepo/elasticsearch-extra/x-pack-elasticsearch/docs/en/../../plugins/examples/script-expert-scoring/src/main/java/org/elasticsearch/example/expertscript/ExpertScriptPlugin.java'
asciidoc: WARNING: engine.asciidoc: line 20: {sys3:/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python /Users/lcawley/GitRepo/docs/resources/asciidoc-8.6.8/../extract-tagged.py /Users/lcawley/GitRepo/elasticsearch-extra/x-pack-elasticsearch/docs/en/../../plugins/examples/script-expert-scoring/src/main/java/org/elasticsearch/example/expertscript/ExpertScriptPlugin.java expert_engine}: non-zero exit status

@debadair
Copy link
Copy Markdown
Contributor Author

@nik9000 Since we're entering the brave new world of cross-repo doc builds, I'm going to leave the es-test-dir name as-is. It's a few more characters to type, but will help minimize any confusion when it's referenced/set outside of the elasticsearch repo alongside similar attributes for other repos.

@debadair debadair merged commit c161d90 into elastic:master Jun 15, 2017
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Jun 16, 2017
…y-context

* 'master' of github.com:elastic/elasticsearch: (21 commits)
  [DOCS] Clarify expected availability of HDFS for the HDFS Repository (elastic#25220)
  Remove some redundant 140 character checkstyle suppressions
  [Docs] more fix for the parent-join docs
  [Docs] Fix cross reference for parent-join field
  More advices around search speed and disk usage. (elastic#25252)
  Add documentation for the new parent-join field (elastic#25227)
  [analysis-icu] Allow setting unicodeSetFilter (elastic#20814)
  Introduce translog size and age based retention policies (elastic#25147)
  Add needs methods for specific variables to Painless script context factories. (elastic#25267)
  Improves snapshot logging and snapshoth deletion error handling (elastic#25264)
  Add unit test for PathHierarchyTokenizerFactory (elastic#24984)
  Deprecate tribe service
  Moved more token filters to analysis-common module.
  [Test] Make sure that SearchAfterSortedDocQueryTests uses a single threaded searcher
  [DOCS] Defined es-test-dir and plugins-examples-dir in index.asciidoc.  (elastic#25232)
  Test fix - removed superfluous assertion (elastic#25247)
  [Test] restore BWC for parent-join now that the new mapping format is in 5.x
  Add a section named "relations" in the ParentJoinFieldMapper (elastic#25248)
  test: Ported more OldIndexBackwardsCompatibilityIT tests to full cluster restart qa tests. (elastic#25173)
  fix: Sort Processor does not have proper behavior with targetField (elastic#25237)
  ...
@clintongormley clintongormley added the >docs General docs changes label Jun 19, 2017
@lcawl
Copy link
Copy Markdown
Contributor

lcawl commented Jun 19, 2017

Based on my tests this needs to be cherry-picked to 5.4, 5.5, and 5.x

lcawl pushed a commit to lcawl/elasticsearch that referenced this pull request Jun 20, 2017
elastic#25232)

Use these attributes when specifying the location of included tests.
@lcawl
Copy link
Copy Markdown
Contributor

lcawl commented Jun 20, 2017

I cherry-picked into 5.x successfully

lcawl pushed a commit that referenced this pull request Jun 20, 2017
#25232)

Use these attributes when specifying the location of included tests.
@lcawl
Copy link
Copy Markdown
Contributor

lcawl commented Jun 20, 2017

Ditto for 5.5

lcawl pushed a commit that referenced this pull request Jun 20, 2017
#25232)

Use these attributes when specifying the location of included tests.
@lcawl
Copy link
Copy Markdown
Contributor

lcawl commented Jun 20, 2017

Ditto for 5.4. No further cherry-picking required as far as I can see.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants