Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add rpm/deb to s3 release #7202

Merged
merged 2 commits into from
May 19, 2016
Merged

Add rpm/deb to s3 release #7202

merged 2 commits into from
May 19, 2016

Conversation

jbudz
Copy link
Member

@jbudz jbudz commented May 13, 2016

Depends on #6676.

This updates the s3 task to look for rpm/deb packages, and if they exist push them to the downloads bucket.

jbudz
jbudz reviewed May 13, 2016
View reviewed changes
tasks/release.js
var links = grunt.config.get('s3.release.upload').reduce((t, {dest}) => {
var link = url.format({
protocol: 'https',
hostname: grunt.config.get('s3.release.bucket'),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should probably be download.elastic.co, bucket is download.elasticsearch.org

@jbudz jbudz force-pushed the release-packages branch from 47fa17f to e4d60e8 Compare May 13, 2016 19:13
@jbudz
Copy link
Member Author

jbudz commented May 16, 2016

jenkins, test it

@jbudz jbudz added the v4.6.0 label May 18, 2016
@epixa epixa added v4.5.2 and removed v4.6.0 labels May 19, 2016
@epixa
Copy link
Contributor

epixa commented May 19, 2016

Can you rebase or merge master?

@jbudz jbudz force-pushed the release-packages branch from e4d60e8 to d0c835d Compare May 19, 2016 15:28
@epixa
Copy link
Contributor

epixa commented May 19, 2016

The net-effect of this change would be that grunt release does what it always has done by default, but if you pass --os-packages to it, then the deb/fpm packages will also be created and the uploaded?

@jbudz
Copy link
Member Author

jbudz commented May 19, 2016 •
edited
Loading

Pretty much. release won't build the packages or do anything with --os-packages, but if the deb/rpms exist (as in previously grunt build --os-packages
edit: yes

@epixa
Copy link
Contributor

epixa commented May 19, 2016

But release runs build, which clears out the target directory. So passing --os-packages should mean that the build task that runs inside release should also build the deb/fpm files.

@jbudz
Copy link
Member Author

jbudz commented May 19, 2016

Whoops, yeah you're right. I was testing individual grunt tasks and hadn't realized release does build as well

@epixa
Copy link
Contributor

epixa commented May 19, 2016

This works great if I'm on Ubuntu and specify --os-packages, but it seems to break the release task if I run it without arguments on os x. The builds finish successfully, but nothing gets uploaded:

Running "_build:archives" task
 > tar -zchf ../target/kibana-5.0.0-snapshot-darwin-x64.tar.gz kibana-5.0.0-snapshot-darwin-x64
 > tar -zchf ../target/kibana-5.0.0-snapshot-linux-x64.tar.gz kibana-5.0.0-snapshot-linux-x64
 > tar -zchf ../target/kibana-5.0.0-snapshot-linux-x86.tar.gz kibana-5.0.0-snapshot-linux-x86
 > tar -zchf ../target/kibana-5.0.0-snapshot-windows.tar.gz kibana-5.0.0-snapshot-windows
 > zip -rq -ll ../target/kibana-5.0.0-snapshot-windows.zip kibana-5.0.0-snapshot-windows
 > zip -rq ../target/kibana-5.0.0-snapshot-darwin-x64.zip kibana-5.0.0-snapshot-darwin-x64
 > zip -rq ../target/kibana-5.0.0-snapshot-linux-x86.zip kibana-5.0.0-snapshot-linux-x86
 > zip -rq ../target/kibana-5.0.0-snapshot-linux-x64.zip kibana-5.0.0-snapshot-linux-x64

Running "_build:shasums" task

Running "s3:release" (s3) task

Running "_release:complete" task
>> Builds released

Done, without errors.

@epixa epixa assigned jbudz and unassigned epixa May 19, 2016
@jbudz
Copy link
Member Author

jbudz commented May 19, 2016

ah right, should be fixed now. I was checking for build files before the build task had run.

@jbudz jbudz assigned epixa and unassigned jbudz May 19, 2016
@epixa epixa merged commit 7491734 into elastic:master May 19, 2016
@epixa
Copy link
Contributor

epixa commented Jun 15, 2016

@jbudz Was this ever backported?

@jbudz
Copy link
Member Author

jbudz commented Jun 15, 2016

It was not. I'll get it done.

@jbudz jbudz added the v4.6.0 label Jun 15, 2016
This was referenced Jun 15, 2016
Merged
Merged
elastic-jasper added a commit that referenced this pull request Jun 15, 2016
@elastic-jasper
Backport PR #7202
431f2fa 
---------

**Commit 1:**
[build] Release packages to s3

* Original sha: d0c835d
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-05-13T16:45:41Z

**Commit 2:**
[build] Check for release files after build task

* Original sha: 032de94
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-05-19T18:16:11Z
elastic-jasper added a commit that referenced this pull request Jun 15, 2016
@elastic-jasper
Backport PR #7202
d3a5e42 
---------

**Commit 1:**
[build] Release packages to s3

* Original sha: d0c835d
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-05-13T16:45:41Z

**Commit 2:**
[build] Check for release files after build task

* Original sha: 032de94
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-05-19T18:16:11Z
jbudz added a commit that referenced this pull request Jun 15, 2016
@jbudz
Merge pull request #7470 from elastic/jasper/backport/7202/4.x
9730592 
[backport] PR #7202 to 4.x
jbudz added a commit that referenced this pull request Jun 15, 2016
@jbudz
Merge pull request #7471 from elastic/jasper/backport/7202/4.5
cf111e4 
[backport] PR #7202 to 4.5
@epixa epixa added v4.5.4 and removed v4.5.2 labels Jul 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@epixa epixa

Labels
review v4.5.4 v4.6.0 v5.0.0-alpha3 v5.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jbudz @epixa