honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-18 02:44:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update platforms tests to use Gradle wrapper

Browse Source 
Gradle will no longer be needed in the test VMs as the Gradle wrapper
can be used to run the platform tests. This commit updates the platform
tests to use the Gradle wrapper, and removes installing Gradle in the VM
which will speed up VM provisioning.

Relates #28105
This commit is contained in:
Jason Tedor 2018-01-05 17:25:10 -05:00 committed by GitHub
parent 79a2c25387
commit f999d639be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Vagrantfile vendored
View File

@ -206,9 +206,6 @@ def provision(config,
v.memory = Integer(ENV['VAGRANT_MEMORY'] || 8192) v.memory = Integer(ENV['VAGRANT_MEMORY'] || 8192)
v.cpus = Integer(ENV['VAGRANT_CPUS'] || 4) v.cpus = Integer(ENV['VAGRANT_CPUS'] || 4)
end end
config.vm.synced_folder "#{Dir.home}/.gradle/caches", "/home/vagrant/.gradle/caches",
create: true,
owner: "vagrant"
config.vm.provision "dependencies", type: "shell", inline: <<-SHELL config.vm.provision "dependencies", type: "shell", inline: <<-SHELL
set -e set -e
set -o pipefail set -o pipefail
@ -273,17 +270,6 @@ def provision(config,
rm -rf /tmp/bats rm -rf /tmp/bats
} }
installed gradle || {
echo "==> Installing Gradle"
curl -sS -o /tmp/gradle.zip -L https://services.gradle.org/distributions/gradle-3.3-bin.zip
unzip -q /tmp/gradle.zip -d /opt
rm -rf /tmp/gradle.zip
ln -s /opt/gradle-3.3/bin/gradle /usr/bin/gradle
# make nfs mounted gradle home dir writeable
chown vagrant:vagrant /home/vagrant/.gradle
}
cat \<\<VARS > /etc/profile.d/elasticsearch_vars.sh cat \<\<VARS > /etc/profile.d/elasticsearch_vars.sh
export ZIP=/elasticsearch/distribution/zip/build/distributions export ZIP=/elasticsearch/distribution/zip/build/distributions
export TAR=/elasticsearch/distribution/tar/build/distributions export TAR=/elasticsearch/distribution/tar/build/distributions
@ -293,7 +279,6 @@ export BATS=/project/build/bats
export BATS_UTILS=/project/build/bats/utils export BATS_UTILS=/project/build/bats/utils
export BATS_TESTS=/project/build/bats/tests export BATS_TESTS=/project/build/bats/tests
export BATS_ARCHIVES=/project/build/bats/archives export BATS_ARCHIVES=/project/build/bats/archives
export GRADLE_HOME=/opt/gradle-3.3
VARS VARS
cat \<\<SUDOERS_VARS > /etc/sudoers.d/elasticsearch_vars cat \<\<SUDOERS_VARS > /etc/sudoers.d/elasticsearch_vars
Defaults env_keep += "ZIP" Defaults env_keep += "ZIP"

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

@ -43,7 +43,7 @@ class VagrantTestPlugin implements Plugin<Project> {
private static final BATS = 'bats' private static final BATS = 'bats'
private static final String BATS_TEST_COMMAND ="cd \$BATS_ARCHIVES && sudo bats --tap \$BATS_TESTS/*.$BATS" private static final String BATS_TEST_COMMAND ="cd \$BATS_ARCHIVES && sudo bats --tap \$BATS_TESTS/*.$BATS"
private static final String PLATFORM_TEST_COMMAND ="rm -rf ~/elasticsearch && rsync -r /elasticsearch/ ~/elasticsearch && cd ~/elasticsearch && \$GRADLE_HOME/bin/gradle test integTest" private static final String PLATFORM_TEST_COMMAND ="rm -rf ~/elasticsearch && rsync -r /elasticsearch/ ~/elasticsearch && cd ~/elasticsearch && ./gradlew test integTest"
@Override @Override
void apply(Project project) { void apply(Project project) {