honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-08 22:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Re-enable debian-8 and fedora-24 packaging tests (#23217)

Browse Source 
These images have been rebuilt to be preloaded with java 8 installed.
This change re-enables the systems. It also removes some redundancy in
the rpm checks I found while testing the new images, and fixes a
potential issue with generated resources in plugins where a stale dir
can cause junk to get into the distribution.
This commit is contained in:
Ryan Ernst 2017-02-16 11:26:46 -08:00 committed by GitHub
parent 164079bb93
commit efb6259e3a
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginPropertiesTask.groovy
View File

@ -40,9 +40,11 @@ class PluginPropertiesTask extends Copy {
templateFile.setText(resourceTemplate.getText('UTF-8'), 'UTF-8') templateFile.setText(resourceTemplate.getText('UTF-8'), 'UTF-8')
} }
} }
doFirst {
project.delete(generatedResourcesDir)
}
dependsOn(copyPluginPropertiesTemplate) dependsOn(copyPluginPropertiesTemplate)
extension = project.extensions.create('esplugin', PluginPropertiesExtension, project) extension = project.extensions.create('esplugin', PluginPropertiesExtension, project)
project.clean.delete(generatedResourcesDir)
project.afterEvaluate { project.afterEvaluate {
// check require properties are set // check require properties are set
if (extension.name == null) { if (extension.name == null) {

6
buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy
View File

@ -16,10 +16,8 @@ class VagrantTestPlugin implements Plugin<Project> {
static List<String> BOXES = [ static List<String> BOXES = [
'centos-6', 'centos-6',
'centos-7', 'centos-7',
// TODO: re-enable debian once it does not have broken openjdk packages 'debian-8',
//'debian-8', 'fedora-24',
// TODO: re-enable fedora once it does not have broken openjdk packages
//'fedora-24',
'oel-6', 'oel-6',
'oel-7', 'oel-7',
'opensuse-13', 'opensuse-13',

6
qa/vagrant/src/test/resources/packaging/tests/40_rpm_package.bats
View File

@ -126,20 +126,14 @@ setup() {
# see postrm file # see postrm file
assert_file_not_exist "/var/log/elasticsearch" assert_file_not_exist "/var/log/elasticsearch"
assert_file_not_exist "/usr/share/elasticsearch/plugins" assert_file_not_exist "/usr/share/elasticsearch/plugins"
assert_file_not_exist "/usr/share/elasticsearch/modules"
assert_file_not_exist "/var/run/elasticsearch" assert_file_not_exist "/var/run/elasticsearch"
# Those directories are removed by the package manager # Those directories are removed by the package manager
assert_file_not_exist "/usr/share/elasticsearch/bin" assert_file_not_exist "/usr/share/elasticsearch/bin"
assert_file_not_exist "/usr/share/elasticsearch/lib" assert_file_not_exist "/usr/share/elasticsearch/lib"
assert_file_not_exist "/usr/share/elasticsearch/modules" assert_file_not_exist "/usr/share/elasticsearch/modules"
assert_file_not_exist "/usr/share/elasticsearch/modules/lang-painless"
assert_file_not_exist "/etc/elasticsearch" assert_file_not_exist "/etc/elasticsearch"
assert_file_not_exist "/etc/elasticsearch/scripts"
assert_file_not_exist "/etc/elasticsearch/elasticsearch.yml"
assert_file_not_exist "/etc/elasticsearch/jvm.options"
assert_file_not_exist "/etc/elasticsearch/log4j2.properties"
assert_file_not_exist "/etc/init.d/elasticsearch" assert_file_not_exist "/etc/init.d/elasticsearch"
assert_file_not_exist "/usr/lib/systemd/system/elasticsearch.service" assert_file_not_exist "/usr/lib/systemd/system/elasticsearch.service"