[Test] Fix docs check for DEB package in packaging tests #30126
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The packaging tests for Debian based distro is loooking for docs in /usr/share/elasticsearch, but it should be /usr/share/elasticsearch-oss for the oss package.
tlrx
added
>test
|
Pinging @elastic/es-core-infra |
tlrx
changed the title
tlrx
changed the title
jasontedor
requested changes
Apr 25, 2018
| @@ -117,8 +117,9 @@ verify_package_installation() { | |||
| assert_file "/etc/default/elasticsearch" f root elasticsearch 660 | |||
|
|
|||
| # Doc files | |||
| assert_file "/usr/share/doc/elasticsearch" d root root 755 | |||
| assert_file "/usr/share/doc/elasticsearch/copyright" f root root 644 | |||
| local docs=$(readlink -f /usr/share/doc/elasticsearch*) | |||
There was a problem hiding this comment.
This is not really about docs since the only file that we put in this path is the copyright file on Debian-based systems only. I would prefer the name not be misleading about the contents of this directory.
Additionally, I think that we can use ${PACKAGE_NAME} instead of elasticsearch* here as that should be set appropriately.
There was a problem hiding this comment.
Would you prefer copyrightDir instead of docs?
There was a problem hiding this comment.
Talked to Jason on another channel, ̀copyrightDir` is okay.
|
@jasontedor Thanks for your review. I updated the code. |
tlrx
added a commit
that referenced
this pull request
Apr 25, 2018
The packaging tests for Debian based distro is loooking for docs in /usr/share/elasticsearch, but it should be /usr/share/elasticsearch-oss for the oss package.
tlrx
added a commit
that referenced
this pull request
Apr 25, 2018
The packaging tests for Debian based distro is loooking for docs in /usr/share/elasticsearch, but it should be /usr/share/elasticsearch-oss for the oss package.
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Apr 25, 2018
* master: [Test] Fix docs check for DEB package in packaging tests (elastic#30126) Painless: Docs Clean Up (elastic#29592) Fixes Eclipse build for sql jdbc project (elastic#30114) Remove reference to `not_analyzed`. [Docs] Add community analysis plugin (elastic#29612) Remove the suggest metric from stats APIs (elastic#29635) Fix byte size value equals/hash code test (elastic#29643) Upgrade to Gradle 4.7 (elastic#29644)
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Apr 25, 2018
* master: [Test] Fix docs check for DEB package in packaging tests (elastic#30126) Painless: Docs Clean Up (elastic#29592) Fixes Eclipse build for sql jdbc project (elastic#30114) Remove reference to `not_analyzed`. [Docs] Add community analysis plugin (elastic#29612) Remove the suggest metric from stats APIs (elastic#29635) Fix byte size value equals/hash code test (elastic#29643) Upgrade to Gradle 4.7 (elastic#29644)
martijnvg
added a commit
that referenced
this pull request
Apr 26, 2018
* es/master: Watcher: Fold two smoke test projects into smoke-test-watcher (#30137) In the field capabilities API, deprecate support for providing fields in the request body. (#30157) Set JAVA_HOME before forking setup commands (#29647) Remove animal sniffer from low-level REST client (#29646) Cleanup .gitignore (#30145) Do not add noop from local translog to translog again (#29637) Build: Assert jar LICENSE and NOTICE files match Correct transport compression algorithm in docs (#29645) [Test] Fix docs check for DEB package in packaging tests (#30126) Painless: Docs Clean Up (#29592) Fixes Eclipse build for sql jdbc project (#30114) Remove reference to `not_analyzed`. [Docs] Add community analysis plugin (#29612)
martijnvg
added a commit
that referenced
this pull request
Apr 26, 2018
* es/6.x: In the field capabilities API, deprecate support for providing fields in the request body. (#30157) Set JAVA_HOME before forking setup commands (#29647) Remove animal sniffer from low-level REST client (#29646) Cleanup .gitignore (#30145) Do not add noop from local translog to translog again (#29637) Painless: Docs Clean Up (#29592) Build: Assert jar LICENSE and NOTICE files match Correct transport compression algorithm in docs (#29645) AwaitsFix for testGradleVersionsMatchVersionUtils [Test] Fix docs check for DEB package in packaging tests (#30126) Remove reference to `not_analyzed`. [Docs] Add community analysis plugin (#29612) [DOCS] Removed differencies between text and code (#27993)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The packaging tests for Debian based distro is loooking for docs in /usr/share/elasticsearch, but it should be
/usr/share/elasticsearch-oss for the oss package.