Backport PR #7490

--------- **Commit 1:** Build artifact names for unified release process These changes are necessary for Kibana to be compatible with Elastic's unified release process from 5.0 onward. The way artifacts get created has not changed, but the naming conventions have. * Original sha: c550bbc * Authored by Court Ewing <[email protected]> on 2016-06-16T11:58:31Z **Commit 2:** README is 5.0.0-alpha4 to match package.json We bumped the version in package.json, but we never changed it in the readme. * Original sha: 55c4993 * Authored by Court Ewing <[email protected]> on 2016-06-16T20:52:58Z
elastic · Jul 22, 2016 · 2abfc65 · 2abfc65
1 parent cea7dae
commit 2abfc65
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,5 @@
 # Kibana 4.6.0
 
-[![Build Status](https://travis-ci.org/elastic/kibana.svg?branch=master)](https://travis-ci.org/elastic/kibana?branch=master)
-
 Kibana is an open source ([Apache Licensed](https://github.com/elastic/kibana/blob/master/LICENSE.md)), browser based analytics and search dashboard for Elasticsearch. Kibana is a snap to setup and start using. Kibana strives to be easy to get started with, while also being flexible and powerful, just like Elasticsearch.
 
 ## Requirements
@@ -43,9 +41,9 @@ Visit [Elastic.co](http://www.elastic.co/guide/en/kibana/current/index.html) for
 
 For the daring, snapshot builds are available. These builds are created after each commit to the master branch, and therefore are not something you should run in production.
 
-| platform |  |  |  |  |
-| --- | --- | --- | --- | --- |
-| OSX | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-darwin-x64.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-darwin-x64.zip) |  |  |
-| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-linux-x64.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-linux-x64.zip) | [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana_4.6.0-snapshot_amd64.deb)| [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0_snapshot-1.x86_64.rpm) |
-| Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-linux-x86.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-linux-x86.zip) | [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana_4.6.0-snapshot_i386.deb) | [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0_snapshot-1.i386.rpm) |
-| Windows | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-windows.tar.gz) | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-snapshot-windows.zip) |  |  |
+| platform |  |
+| --- | --- |
+| OSX | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-SNAPSHOT-darwin-x64.tar.gz) |
+| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-SNAPSHOT-linux-x64.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-SNAPSHOT-amd64.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-SNAPSHOT-x86_64.rpm) |
+| Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-SNAPSHOT-linux-x86.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-SNAPSHOT-i386.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-SNAPSHOT-i686.rpm) |
+| Windows | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-4.6.0-SNAPSHOT-windows.zip) |
diff --git a/tasks/build/osPackages.js b/tasks/build/osPackages.js
@@ -16,19 +16,14 @@ export default (grunt) => {
 
     config.get('platforms')
     .filter(({ name }) => /linux-x(86|64)$/.test(name))
-    .map(({ name, buildDir }) => {
-      const architecture = /x64$/.test(name) ? 'x86_64' : 'i386';
-      return {
-        buildDir,
-        architecture
-      };
-    })
-    .forEach(({ buildDir, architecture }) => {
+    .forEach(({ buildDir, debArch, rpmArch }) => {
       const baseOptions = [
         '--force',
-        '--package', targetDir,
+        // we force dashes in the version file name because otherwise fpm uses
+        // the filtered package version, which would have dashes replaced with
+        // underscores
+        '--package', `${targetDir}/NAME-${packages.version}-ARCH.TYPE`,
         '-s', 'dir', // input type
-        '--architecture', architecture,
         '--name', packages.name,
         '--description', packages.description,
         '--version', packages.version,
@@ -51,10 +46,12 @@ export default (grunt) => {
       ];
       const debOptions = [
         '-t', 'deb',
+        '--architecture', debArch,
         '--deb-priority', 'optional'
       ];
       const rpmOptions = [
         '-t', 'rpm',
+        '--architecture', rpmArch,
         '--rpm-os', 'linux'
       ];
       const args = [

diff --git a/tasks/config/platforms.js b/tasks/config/platforms.js
@@ -30,13 +30,15 @@ module.exports = function (grunt) {
     let debPath;
     let rpmName;
     let rpmPath;
+    let debArch;
+    let rpmArch;
     if (name.match('linux')) {
-      let debArch = name.match('x64') ? 'amd64' : 'i386';
-      debName = `kibana_${version}_${debArch}.deb`;
+      debArch = name.match('x64') ? 'amd64' : 'i386';
+      debName = `kibana-${version}-${debArch}.deb`;
       debPath = resolve(rootPath, `target/${debName}`);
 
-      let rpmArch = name.match('x64') ? 'x86_64' : 'i386';
-      rpmName = `kibana-${version.replace('-', '_')}-1.${rpmArch}.rpm`;
+      rpmArch = name.match('x64') ? 'x86_64' : 'i686';
+      rpmName = `kibana-${version}-${rpmArch}.rpm`;
       rpmPath = resolve(rootPath, `target/${rpmName}`);
     }
     return {
@@ -45,8 +47,8 @@ module.exports = function (grunt) {
       buildName, buildDir,
       tarName, tarPath,
       zipName, zipPath,
-      debName, debPath,
-      rpmName, rpmPath
+      debName, debPath, debArch,
+      rpmName, rpmPath, rpmArch
     };
   });
 };