[test] include oss tar in packaging tests (#30155)

Add the oss tar distribution to the packaging test plugin. Test the oss tar distribution in the core packaging tests, and the non-oss tar distribution in the x-pack packaging tests.
elastic · Apr 26, 2018 · bc197b0 · bc197b0
1 parent c8d375b
commit bc197b0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy
@@ -37,8 +37,15 @@ class VagrantTestPlugin implements Plugin<Project> {
             'ubuntu-1404',
     ]
 
-    /** All onboarded archives by default, available for Bats tests even if not used **/
-    static List<String> DISTRIBUTION_ARCHIVES = ['tar', 'rpm', 'deb', 'oss-rpm', 'oss-deb']
+    /** All distributions to bring into test VM, whether or not they are used **/
+    static List<String> DISTRIBUTIONS = [
+            'archives:tar',
+            'archives:oss-tar',
+            'packages:rpm',
+            'packages:oss-rpm',
+            'packages:deb',
+            'packages:oss-deb'
+    ]
 
     /** Packages onboarded for upgrade tests **/
     static List<String> UPGRADE_FROM_ARCHIVES = ['rpm', 'deb']
@@ -117,13 +124,8 @@ class VagrantTestPlugin implements Plugin<Project> {
             upgradeFromVersion = Version.fromString(upgradeFromVersionRaw)
         }
 
-        DISTRIBUTION_ARCHIVES.each {
+        DISTRIBUTIONS.each {
             // Adds a dependency for the current version
-            if (it == 'tar') {
-                it = 'archives:tar'
-            } else {
-                it = "packages:${it}"
-            }
             project.dependencies.add(PACKAGING_CONFIGURATION,
                     project.dependencies.project(path: ":distribution:${it}", configuration: 'default'))
         }

diff --git a/qa/vagrant/src/test/resources/packaging/tests/20_tar_package.bats b/qa/vagrant/src/test/resources/packaging/tests/20_tar_package.bats
@@ -55,7 +55,8 @@ setup() {
 }
 
 @test "[TAR] archive is available" {
-    count=$(find . -type f -name 'elasticsearch*.tar.gz' | wc -l)
+    local version=$(cat version)
+    count=$(find . -type f -name "${PACKAGE_NAME}-${version}.tar.gz" | wc -l)
     [ "$count" -eq 1 ]
 }
 

diff --git a/qa/vagrant/src/test/resources/packaging/utils/tar.bash b/qa/vagrant/src/test/resources/packaging/utils/tar.bash
@@ -35,10 +35,12 @@
 install_archive() {
     export ESHOME=${1:-/tmp/elasticsearch}
 
+    local version=$(cat version)
+
     echo "Unpacking tarball to $ESHOME"
     rm -rf /tmp/untar
     mkdir -p /tmp/untar
-    tar -xzpf elasticsearch*.tar.gz -C /tmp/untar
+    tar -xzpf "${PACKAGE_NAME}-${version}.tar.gz" -C /tmp/untar
 
     find /tmp/untar -depth -type d -name 'elasticsearch*' -exec mv {} "$ESHOME" \; > /dev/null
 
@@ -79,6 +81,8 @@ export_elasticsearch_paths() {
     export ESSCRIPTS="$ESCONFIG/scripts"
     export ESDATA="$ESHOME/data"
     export ESLOG="$ESHOME/logs"
+
+    export PACKAGE_NAME=${PACKAGE_NAME:-"elasticsearch-oss"}
 }
 
 # Checks that all directories & files are correctly installed

diff --git a/x-pack/qa/vagrant/src/test/resources/packaging/tests/10_basic.bats b/x-pack/qa/vagrant/src/test/resources/packaging/tests/10_basic.bats
@@ -19,6 +19,7 @@ load $BATS_UTILS/xpack.bash
 setup() {
     skip_not_tar_gz
     export ESHOME=/tmp/elasticsearch
+    export PACKAGE_NAME="elasticsearch"
     export_elasticsearch_paths
     export ESPLUGIN_COMMAND_USER=elasticsearch
 }