Merge pull request #7387 from jbudz/issues/6728

[packages] Set publish prefix kibana/major_version.x
This commit is contained in:
Jonathan Budzenski 2016-06-15 09:56:00 -05:00 committed by GitHub
commit b32949dfcd
3 changed files with 7 additions and 6 deletions

View file

@ -8,6 +8,7 @@
:k4pull: https://github.com/elastic/kibana/pull/
:version: master
:esversion: master
:packageversion: master
include::introduction.asciidoc[]

View file

@ -26,7 +26,7 @@ wget -qO - https://packages.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add
+
["source","sh",subs="attributes"]
--------------------------------------------------
echo "deb http://packages.elastic.co/kibana/{version}/debian stable main" | sudo tee -a /etc/apt/sources.list.d/kibana.list
echo "deb https://packages.elastic.co/kibana/{packageversion}/debian stable main" | sudo tee -a /etc/apt/sources.list.d/kibana.list
--------------------------------------------------
+
[WARNING]
@ -82,11 +82,11 @@ rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch
+
["source","sh",subs="attributes"]
--------------------------------------------------
[kibana-{version}]
name=Kibana repository for {version}.x packages
baseurl=http://packages.elastic.co/kibana/{version}/centos
[kibana-{packageversion}]
name=Kibana repository for {packageversion} packages
baseurl=https://packages.elastic.co/kibana/{packageversion}/centos
gpgcheck=1
gpgkey=http://packages.elastic.co/GPG-KEY-elasticsearch
gpgkey=https://packages.elastic.co/GPG-KEY-elasticsearch
enabled=1
--------------------------------------------------
+

View file

@ -2,7 +2,7 @@ export default (grunt) => {
const VERSION = grunt.config.get('build.version');
const FOLDER_STAGING = `kibana/staging/${VERSION.match(/\d\.\d\.\d/)[0]}-XXXXXXX/repos/${VERSION.match(/\d\./)[0]}x`;
const FOLDER_PRODUCTION = `kibana/${VERSION.match(/\d\.\d/)[0]}`;
const FOLDER_PRODUCTION = `kibana/${VERSION.match(/\d\./)[0]}x`;
const FOLDERNAME_DEB = 'debian';
const FOLDERNAME_RPM = 'centos';