You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/10/26 05:59:32 UTC
[1/4] brooklyn-docs git commit: Significant updates to the release
process
Repository: brooklyn-docs
Updated Branches:
refs/heads/master 0ae570a43 -> 14d2c3605
Significant updates to the release process
Makes lots of updates related to us now being a top-level project, and
no longer in the Incubator.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/b08fded4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/b08fded4
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/b08fded4
Branch: refs/heads/master
Commit: b08fded4d94389d0b6760591e3966759d3c64b99
Parents: 9f2f0cf
Author: Richard Downer <ri...@apache.org>
Authored: Wed Jun 29 16:49:32 2016 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Wed Jun 29 16:50:19 2016 +0100
----------------------------------------------------------------------
.../release-process/environment-variables.md | 10 +-
.../committers/release-process/index.md | 8 +-
.../release-process/make-release-artifacts.md | 33 +++----
.../committers/release-process/prerequisites.md | 25 +++--
.../committers/release-process/publish-temp.md | 20 +++-
.../committers/release-process/publish.md | 18 +++-
.../release-process/release-version.md | 41 +++++---
.../committers/release-process/vote-ipmc.md | 99 --------------------
.../committers/release-process/vote.md | 6 +-
9 files changed, 104 insertions(+), 156 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b08fded4/website/developers/committers/release-process/environment-variables.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/environment-variables.md b/website/developers/committers/release-process/environment-variables.md
index 86e7fe7..5ba0646 100644
--- a/website/developers/committers/release-process/environment-variables.md
+++ b/website/developers/committers/release-process/environment-variables.md
@@ -11,11 +11,17 @@ releases. To allow these example commands to run unmodified, set these environme
# The version currently set on the master branch (BROOKLYN_VERSION_BELOW)
OLD_MASTER_VERSION=0.10.0-SNAPSHOT
# The next version to be set on the master branch
-NEW_MASTER_VERSION=0.NNN+1.0-SNAPSHOT
+NEW_MASTER_VERSION=0.10.0-SNAPSHOT
# The version we are releasing now.
-VERSION_NAME=0.NNN.0
+VERSION_NAME=0.9.0
# The release candidate number we are making now.
RC_NUMBER=1
+
+# Modules and submodules - these will come in handy later
+SUBMODULES="$( perl -n -e 'if ($_ =~ /path += +(.*)$/) { print $1."\n" }' < .gitmodules )"
+MODULES=". ${SUBMODULES}"
{% endhighlight %}
+
+Alternatively, use the command `eval $( ./brooklyn-dist/release/environment.sh )` to set these values automatically.
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b08fded4/website/developers/committers/release-process/index.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/index.md b/website/developers/committers/release-process/index.md
index 9d67965..812d3f6 100644
--- a/website/developers/committers/release-process/index.md
+++ b/website/developers/committers/release-process/index.md
@@ -11,11 +11,9 @@ children:
- { path: publish-temp.md }
- { path: vote.md }
- { path: fix-release.md }
-- { path: vote-ipmc.md }
- { path: publish.md }
- { path: announce.md }
---
-0. Review and update these instructions, post-graduation from incubation!
1. [Prerequisites](prerequisites.html) - steps that a new release manager must do (but which only need to be done once)
2. [Set environment variables](environment-variables.html) - many example snippets here use environment variables to
avoid repetition - this page describes what they are
@@ -25,7 +23,5 @@ children:
5. [Publish the release artifacts to the staging area](publish-temp.html)
6. [Vote on the dev@brooklyn list](vote.html)
1. If the vote fails - [fix the release branch](fix-release.html) and resume from step 3
-7. [Vote on the general@incubator list](vote-ipmc.html)
- 1. If the vote fails - [fix the release branch](fix-release.html) and resume from step 3
-8. [Publish the release artifacts to the public location](publish.html)
-9. [Announce the release](announce.html)
+7. [Publish the release artifacts to the public location](publish.html)
+8. [Announce the release](announce.html)
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b08fded4/website/developers/committers/release-process/make-release-artifacts.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/make-release-artifacts.md b/website/developers/committers/release-process/make-release-artifacts.md
index 8b14c7d..730a7cb 100644
--- a/website/developers/committers/release-process/make-release-artifacts.md
+++ b/website/developers/committers/release-process/make-release-artifacts.md
@@ -15,26 +15,26 @@ The release script will:
The script has a single required parameter `-r` which is given the release candidate number - so `-r1` will create
release candidate 1 and will name the artifacts appropriately.
-Before running this however, it is a good idea to check the `apache-release` profile build is healthy.
-This will catch glitches such as PGP or javadoc problems without doing time-consuming uploads:
+The script takes a `-n` parameter to work in *dry run* mode; in this mode, the script will NOT upload Maven artifacts
+or commit the release to the Subversion repository. This speeds up the process (the Maven deploy in particular slows
+down the build) and will catch any problems such as PGP or javadoc problems much sooner.
{% highlight bash %}
-mvn clean install -Papache-release
-{% endhighlight %}
-
-To run the script:
+# A dry run to test everything is OK
+./brooklyn-dist/release/make-release-artifacts.sh -r$RC_NUMBER -n
-{% highlight bash %}
+# The real build, which will publish artifacts
./brooklyn-dist/release/make-release-artifacts.sh -r$RC_NUMBER
{% endhighlight %}
-It will show you the release information it has deduced, and ask yes-or-no if it can proceed. Please note that the
-script will thoroughly clean the Git workspace of all uncommited and unadded files.
-
-**You really probably want to run this against a secondary checkout.** It will wipe `.project` files and other IDE metadata, and bad things can happen if an IDE tries to write while the script is running. Also as it takes a long time, this means your workspace is not tied up. One quick and easy way to do this is to `git clone` the local directory of your primary checkout to a secondary location.
+It will show you the release information it has deduced, and ask yes-or-no if it can proceed. Then you will be prompted
+for the passphrase to your GnuPG private key. You should only be asked this question once; the GnuPG agent will cache
+the password for the remainder of the build.
-A few minutes into the script you will be prompted for the passphrase to your GnuPG private key. You should only be
-asked this question once; the GnuPG agent will cache the password for the remainder of the build.
+Please note that the script will thoroughly clean the Git workspace of all uncommitted and unadded files **even in dry
+run mode**. Therefore **you really want to run this against a secondary checkout.** It will wipe `.project` files and
+other IDE metadata, and bad things can happen if an IDE tries to write while the script is running. Consider using the
+Vagrant configuration provided.
Please note that uploading to the Nexus staging repository is a slow process. Expect this stage of the build to take
2 hours.
@@ -49,10 +49,3 @@ The release script will:
5. For each of the produced files, produce MD5, SHA1, SHA256 and GnuPG signatures
At the end of the script, it will show you the files it has produced and their location.
-
-Make a signed tag for this release, and then push the tag:
-
-{% highlight bash %}
-git tag -s -m "Tag release ${VERSION_NAME} release candidate ${RC_NUMBER}" apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
-git push apache apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
-{% endhighlight %}
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b08fded4/website/developers/committers/release-process/prerequisites.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/prerequisites.md b/website/developers/committers/release-process/prerequisites.md
index d6afc75..c4269f5 100644
--- a/website/developers/committers/release-process/prerequisites.md
+++ b/website/developers/committers/release-process/prerequisites.md
@@ -36,6 +36,8 @@ The following software packages are required during the build. Make sure you hav
- A Java Development Kit, version 1.7
- `maven` and `git`
+- Go Language 1.6 - usually provided by the `golang` package on popular distributions
+- The `rpmbuild` command - usually provided by the `rpm` package on popular distributions
- `xmlstarlet` is required by the release script to process version numbers in `pom.xml` files;
on mac, `port install xmlstarlet` should do the trick.
- `zip` and `unzip`
@@ -45,6 +47,7 @@ The following software packages are required during the build. Make sure you hav
- `md5sum` and `sha1sum` - these are often present by default on Linux, but not on Mac;
`port install md5sha1sum` should remedy that.
- if `gpg` does not resolve (it is needed for maven), create an alias or script pointing at `gpg2 "$@"`
+- the `mmv` command (usually in a package named `mmv`) will help with the final steps of the release process
GPG keys
@@ -79,16 +82,26 @@ cd apache-dist-release-brooklyn
svn --username $SVN_USERNAME commit -m 'Update brooklyn/KEYS for $GPG_KEY'
{% endhighlight %}
-References:
+References:
+
* [Post on the general@incubator list](https://mail-archives.apache.org/mod_mbox/incubator-general/201410.mbox/%3CCAOGo0VawupMYRWJKm%2Bi%2ByMBqDQQtbv-nQkfRud5%2BV9PusZ2wnQ%40mail.gmail.com%3E)
* [GPG cheatsheet](http://irtfweb.ifa.hawaii.edu/~lockhart/gpg/gpg-cs.html)
+We recommend the use of the `gpg-agent`, as the release process invokes gpg to sign a large number of artifacts, one at
+a time. The agent stores its configuration in `~/.gnupg/gpg-agent.conf`. A sample configuration is shown below; it uses
+the Mac OSX `pinentry-mac` program which can be obtained through MacPorts or other sources. For other platforms you will
+need to change this; sometimes you can omit it completely and your OS will pick a suitable alternative. The following
+two lines cause your passphrase to be cached in memory for a limited period; it will expire from the cache 30 minutes
+after it was most recently accessed, or 4 hours after it was first cached.
+
+```
+pinentry-program /Applications/MacPorts/pinentry-mac.app/Contents/MacOS/pinentry-mac
+default-cache-ttl 1800
+max-cache-ttl 14400
+```
+
If you experience trouble with PGP subsequently (when running maven):
-* On Mac make sure that `~/.gnupg/gpg-agent.conf` refers to the right file for `pinentry-program`;
- it must point at a *binary* and preferably a pop-up which is keychain-aware,
- such as with macports `/Applications/MacPorts/pinentry-mac.app/Contents/MacOS/pinentry-mac`
-* When the `pinentry` dialog pops up, tick to "Save to keychain", otherwise it will keep popping up
- and may time out and fail the build
+
* See [GnuPG/Pinentry Enigmail debugging](https://www.enigmail.net/support/gnupg2_issues.php) for tips on diagnosing gpg-agent communication (from the process to this agent and from this agent to the pinentry program)
* See [GnuPG Agent Options](https://www.gnupg.org/documentation/manuals/gnupg/Agent-Options.html) for extended gpg-agent debug
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b08fded4/website/developers/committers/release-process/publish-temp.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/publish-temp.md b/website/developers/committers/release-process/publish-temp.md
index 64814e8..0a87444 100644
--- a/website/developers/committers/release-process/publish-temp.md
+++ b/website/developers/committers/release-process/publish-temp.md
@@ -4,6 +4,22 @@ title: Publish to the staging area
navgroup: developers
---
+Update the canonical Git repository
+-----------------------------------
+
+Make a signed tag for this release candidate:
+
+{% highlight bash %}
+for m in ${MODULES}; do ( cd $m && git tag -s -m "Tag release ${VERSION_NAME} release candidate ${RC_NUMBER}" rel/apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER} ); done
+{% endhighlight %}
+
+Now push the release branch and release candidate tag:
+
+{% highlight bash %}
+for m in ${MODULES}; do ( cd $m && git push apache-git $VERSION_NAME && git push apache-git rel/apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER} ); done
+{% endhighlight %}
+
+
Publish the source and binary distributions to the pre-release area
-------------------------------------------------------------------
@@ -17,8 +33,8 @@ In your workspace for the `dist.apache.org` repo, create a directory with the ar
mkdir apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
{% endhighlight %}
-Copy into this directory all of the artifacts from the previous step - `-src` and `-bin`, `.tar.gz` and `.zip`, and all
-associated `.md5`, `.sha1`, `.sha256` and `.asc` signatures. Then commit:
+Copy into this directory all of the artifacts from the previous step - `-src` and `-bin`, `.tar.gz`, `.zip` and `.rpm`,
+and all associated `.md5`, `.sha1`, `.sha256` and `.asc` signatures. Then commit:
{% highlight bash %}
svn add apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b08fded4/website/developers/committers/release-process/publish.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/publish.md b/website/developers/committers/release-process/publish.md
index e23bdaf..e2b1e11 100644
--- a/website/developers/committers/release-process/publish.md
+++ b/website/developers/committers/release-process/publish.md
@@ -4,6 +4,21 @@ title: Publish to the public
navgroup: developers
---
+Update the canonical Git repository
+-----------------------------------
+
+Make a signed tag for this release:
+
+{% highlight bash %}
+for m in ${MODULES}; do ( cd $m && git tag -s -m "Tag release ${VERSION_NAME}" rel/apache-brooklyn-${VERSION_NAME} rel/apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER} ); done
+{% endhighlight %}
+
+Now push the release tag:
+
+{% highlight bash %}
+for m in ${MODULES}; do ( cd $m && git push apache-git rel/apache-brooklyn-${VERSION_NAME} ); done
+{% endhighlight %}
+
Publish the source and binary distributions to the pre-release area
-------------------------------------------------------------------
@@ -40,8 +55,7 @@ Note that the PGP signatures do not embed the filename so they do not need to be
As a final check, re-test the hashes and signatures:
{% highlight bash %}
-for ext in -src.tar.gz -src.zip -bin.tar.gz -bin.zip; do
- artifact=apache-brooklyn-${VERSION_NAME}${ext}
+for artifact in *.tar.gz *.zip *.rpm; do
md5sum -c ${artifact}.md5
shasum -a1 -c ${artifact}.sha1
shasum -a256 -c ${artifact}.sha256
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b08fded4/website/developers/committers/release-process/release-version.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/release-version.md b/website/developers/committers/release-process/release-version.md
index a22314b..ac83e77 100644
--- a/website/developers/committers/release-process/release-version.md
+++ b/website/developers/committers/release-process/release-version.md
@@ -7,15 +7,13 @@ navgroup: developers
This will allow development to continue on master without affecting the release; it also allows quick-fixes to the
release branch to address last-minute problems (which must of course be merged/cherry-picked back into master later).
-Determine the correct name for the version. Note that while in incubation, we must include \u201cincubating\u201d in our release
-name - common practice for this is to append \u201c-incubating\u201d to the release version.
-
Do not use -rc1, -rc2 etc. in version strings. Use the version that will be the actual published version. (The artifacts
that get uploaded to the dist.apache.org/dev will include \u201c-rc1\u201d etc. in the folder name, but the contents will be *as
final*. Therefore, turning the rc into the final is simply a case of taking the rc file and publishing it to the release
folder with the correct name.)
References:
+
- [Post on general@incubator](https://mail-archives.apache.org/mod_mbox/incubator-general/201409.mbox/%3CCAK2iWdS1H9dkJcSdohky6hFqJdP0XyuhAG%2B%3D1Aspxcjt5RmnJw%40mail.gmail.com%3E)
- [Post on general@incubator](https://mail-archives.apache.org/mod_mbox/incubator-general/201409.mbox/%3CCAOGo0VaEz4cEUbgMgqhh3hiiiubnspiGkQ%3DQv08bOwPqRtzAvQ%40mail.gmail.com%3E)
@@ -28,20 +26,26 @@ Create a branch with the same name as the version, based off master:
{% highlight bash %}
git checkout master
git pull --rebase # assumes that the Apache canonical repository is the default upstream for your master - amend if necessary
-git checkout -b $VERSION_NAME
-git push -u apache $VERSION_NAME
+git submodule update --remote --merge --recursive
+for m in $MODULES; do ( cd $m && git checkout master && git checkout -b $VERSION_NAME ); done
{% endhighlight %}
Now change the version numbers in this branch throughout the project using the script `brooklyn-dist/release/change-version.sh` and commit it:
{% highlight bash %}
./brooklyn-dist/release/change-version.sh BROOKLYN $OLD_MASTER_VERSION $VERSION_NAME
-git add .
-# Now inspect the staged changes and ensure there are no surprises
-git commit -m "Change version to $VERSION_NAME"
-git push
+# Now inspect the changes and ensure there are no surprises
+find . -name "*.bak" -delete
+for m in $SUBMODULES; do ( cd $m && git add . && git commit -m "Change version to $VERSION_NAME" ); done
+git add $SUBMODULES && git commit -m "Update submodules to $VERSION_NAME"
+git add . && git commit -m "Change version to $VERSION_NAME"
{% endhighlight %}
+If you are happy with the changes, push them:
+
+{% highlight bash %}
+for m in $MODULES; do ( cd $m && git push apache-git $VERSION ); done
+{% endhighlight %}
Update the version on master
@@ -55,10 +59,9 @@ The release notes should be cleared out and the version history augmented with t
Example:
{% highlight bash %}
-git checkout master
+for m in $MODULES; do ( cd $m && git checkout master ); done
./brooklyn-dist/release/change-version.sh BROOKLYN $OLD_MASTER_VERSION $NEW_MASTER_VERSION
-git add .
-# Now inspect the staged changes and ensure there are no surprises
+# Now inspect the changes and ensure there are no surprises
{% endhighlight %}
Open `brooklyn-docs/guide/misc/release-notes.md` and `brooklyn-docs/website/meta/versions.md` in your favourite editor and amend.
@@ -68,8 +71,16 @@ and putting some placeholder text elsewhere.
Then:
{% highlight bash %}
-git commit -m "Change version to $NEW_MASTER_VERSION"
-git push
+find . -name "*.bak" -delete
+for m in $SUBMODULES; do ( cd $m && git add . && git commit -m "Change version to $NEW_MASTER_VERSION" ); done
+git add $SUBMODULES && git commit -m "Update submodules to $NEW_MASTER_VERSION"
+git add . && git commit -m "Change version to $NEW_MASTER_VERSION"
+{% endhighlight %}
+
+If you are happy with the changes, push them:
+
+{% highlight bash %}
+for m in $MODULES; do ( cd $m && git push apache-git master ); done
{% endhighlight %}
@@ -79,5 +90,5 @@ Switch back to the release branch
Move back to the release branch:
{% highlight bash %}
-git checkout $VERSION_NAME
+for m in $MODULES; do ( cd $m && git checkout $VERSION_NAME ); done
{% endhighlight %}
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b08fded4/website/developers/committers/release-process/vote-ipmc.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/vote-ipmc.md b/website/developers/committers/release-process/vote-ipmc.md
deleted file mode 100644
index 5278acc..0000000
--- a/website/developers/committers/release-process/vote-ipmc.md
+++ /dev/null
@@ -1,99 +0,0 @@
----
-layout: website-normal
-title: Vote on general@incubator
-navgroup: developers
----
-
-Copy-paste the e-mail below, being sure to substitute:
-
-- version number
-- RC number
-- \u201csource release of\u201d or \u201crelease of\u201d
-- URLs for the [VOTE] and [RESULT][VOTE] messages on dev@brooklyn
-- URLs containing version numbers
-- URL for your own asc key
-- Checksums
-
-### Subject: [VOTE] Release Apache Brooklyn 0.7.0-incubating [rc1]
-
-{% highlight text %}
-This is to call for a vote for the release of Apache Brooklyn 0.7.0-incubating.
-
-The Apache Brooklyn community have voted in favour of making this release:
-Vote thread:
-https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201507.mbox/%3CCABQFKi1WapCMRUqQ93E7Qow5onKgL3nyG3HW9Cse7vo%2BtUChRQ%40mail.gmail.com%3E
-Result email:
-https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201507.mbox/%3CCABQFKi2aJHHfXGC0xsMFU0odfB5X6FF5xhpHbs93%2BNfS-fNRZw%40mail.gmail.com%3E
-
-We now ask the IPMC to vote on this release.
-
-This release comprises of a source code distribution, and a corresponding
-binary distribution, and Maven artifacts.
-
-The source and binary distributions, including signatures, digests, etc. can
-be found at:
-https://dist.apache.org/repos/dist/dev/incubator/brooklyn/apache-brooklyn-0.7.0-incubating-rc1
-
-The artifact SHA-256 checksums are as follows:
-c3b5c581f14b44aed786010ac7c8c2d899ea0ff511135330395a2ff2a30dd5cf *apache-brooklyn-0.7.0-incubating-rc1-bin.tar.gz
-cef49056ba6e5bf012746a72600b2cee8e2dfca1c39740c945c456eacd6b6fca *apache-brooklyn-0.7.0-incubating-rc1-bin.zip
-8069bfc54e7f811f6b57841167b35661518aa88cabcb070bf05aae2ff1167b5a *apache-brooklyn-0.7.0-incubating-rc1-src.tar.gz
-acd2229c44e93e41372fd8b7ea0038f15fe4aaede5a3bcc5056f28a770543b82 *apache-brooklyn-0.7.0-incubating-rc1-src.zip
-
-The Nexus staging repository for the Maven artifacts is located at:
-https://repository.apache.org/content/repositories/orgapachebrooklyn-1004
-
-All release artifacts are signed with the following key:
-https://people.apache.org/keys/committer/richard.asc
-
-KEYS file available here:
-https://dist.apache.org/repos/dist/release/incubator/brooklyn/KEYS
-
-The artifacts were built from Git commit ID
-24a23c5a4fd5967725930b8ceaed61dfbd225980
-https://git-wip-us.apache.org/repos/asf?p=incubator-brooklyn.git;a=commit;h=24a23c5a4fd5967725930b8ceaed61dfbd225980
-
-
-Please vote on releasing this package as Apache Brooklyn 0.7.0-incubating.
-
-The vote will be open for at least 72 hours.
-[ ] +1 Release this package as Apache Brooklyn 0.7.0-incubating
-[ ] +0 no opinion
-[ ] -1 Do not release this package because ...
-
-
-Thanks,
-[Release manager name]
-{% endhighlight %}
-
-Email out the vote result
--------------------------
-
-This is a similar process to counting the votes on the dev@brooklyn list. You will need 3 IPMC members to issue a \u201c+1
-binding\u201d vote, and no IPMC \u201c0 binding\u201d or \u201c-1 binding\u201d votes. Once the voting period has elapsed and the required votes
-received, email out a vote result email. Again this should be a new email thread with the subject prefixed
-\u201c[RESULT][VOTE]\u201d.
-
-### Subject: [RESULT][VOTE] Release Apache Brooklyn 0.7.0-incubating [rc1]
-
-{% highlight text %}
-The vote for releasing Apache Brooklyn 0.7.0-incubating passed with 3 binding +1s, 0 non-binding +1s, and no 0 or -1.
-
-Vote thread link:
-https://mail-archives.apache.org/mod_mbox/incubator-general/201507.mbox/%3CCABQFKi1xMzduVruYXdA15BQkZGVaYnmOChSfUvMw3uWcHA1Beg%40mail.gmail.com%3E
-
-
-Binding +1s:
-Hadrian Zbarcea
-Justin Mclean
-Jean-Baptiste Onofr�
-
-
-Thanks to everyone that tested our release and voted.
-
-We will shortly publish the release artifacts.
-
-
-Thanks,
-[Release manager name]
-{% endhighlight %}
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b08fded4/website/developers/committers/release-process/vote.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/vote.md b/website/developers/committers/release-process/vote.md
index d3b466b..144abe7 100644
--- a/website/developers/committers/release-process/vote.md
+++ b/website/developers/committers/release-process/vote.md
@@ -131,9 +131,7 @@ Ciprian Ciubotariu
Thanks to everyone that tested our release and voted.
-We will shortly begin a vote on the incubator-general list.
-
-
-Thanks.
+Next, the release manager will publish the artifacts, and make an announcement to this list once they are available from
+the Apache mirrors.
{% endhighlight %}
[2/4] brooklyn-docs git commit: Tidy up example brooklyn.properties
Posted by sv...@apache.org.
Tidy up example brooklyn.properties
* Tell people that the catalog is the recommended way to configure
locations.
* Move AWS out of \u201cGetting Started\u201d. The user can add a location via
the UI; that is what we should encourage.
* Remove HP Cloud, because that service no longer exists.
* Fix a few links.
* installDevUrandom now defaults to true; update comment.
* comment out everything (including AWS creds example) as we want to
encourage use of catalog.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/bde6d2e6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/bde6d2e6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/bde6d2e6
Branch: refs/heads/master
Commit: bde6d2e6e9bd369a752fd2d7c4f2cefb27aaf379
Parents: 89bf56d
Author: Aled Sage <al...@gmail.com>
Authored: Thu Sep 8 17:29:45 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Sep 8 17:37:17 2016 +0100
----------------------------------------------------------------------
guide/start/brooklyn.properties | 154 +++++++++++++++++++----------------
1 file changed, 82 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/bde6d2e6/guide/start/brooklyn.properties
----------------------------------------------------------------------
diff --git a/guide/start/brooklyn.properties b/guide/start/brooklyn.properties
index f517556..8714364 100644
--- a/guide/start/brooklyn.properties
+++ b/guide/start/brooklyn.properties
@@ -31,63 +31,28 @@
## GUI Security
-## NOTE: in production it is highly recommended to set this, as otherwise it will not require login,
-## not will it be encrypted (though for safety if security is not set it will only bind to loopback)
+## NOTE: in production it is highly recommended to set up security.
+## See http://brooklyn.apache.org/v/latest/ops/brooklyn_properties.html#authentication
-## Edit the name(s) and passwords as appropriate to your system:
+## Edit the name(s) and passwords as appropriate to your system, or even better generate
+## a salt and sha256 of your password.
# brooklyn.webconsole.security.users=admin,bob
# brooklyn.webconsole.security.user.admin.password=password
# brooklyn.webconsole.security.user.bob.password=bobsword
-## If you prefer to run with https (on port 8443 by default), uncomment this:
+## If you prefer to run with https (on port 8443 by default), either configure this on the
+## command line (see or http://brooklyn.apache.org/v/latest/ops/server-cli-reference.html#launch-command)
+## or uncomment this:
# brooklyn.webconsole.security.https.required=true
-# By default we have AWS set up (but with invalid credentials!). Many, many other
-# providers are supported.
-
-## Amazon EC2 Credentials
-# These should be an "Access Key ID" and "Secret Access Key" for your account.
-# This is configured at https://console.aws.amazon.com/iam/home?#security_credential .
-
-brooklyn.location.jclouds.aws-ec2.identity = AKA_YOUR_ACCESS_KEY_ID
-brooklyn.location.jclouds.aws-ec2.credential = <access-key-hex-digits>
-
-# Beware of trailing spaces in your cloud credentials. This will cause unexpected
-# 401: unauthorized responses.
-
-## Using Other Clouds
-# 1. Cast your eyes down this document to find your preferred cloud in the Named Locations
-# section, and the examples.
-# 2. Uncomment the relevant line(s) for your provider.
-# 3. ADD -.identity and -.credential lines for your provider, similar to the AWS ones above,
-# replacing 'aws-ec2' with jcloud's id for your cloud.
-
-
-## Deploying to Localhost
-## see: info on locations at brooklyn.io
-#
-## ~/.ssh/id_rsa is Brooklyn's default location
-# brooklyn.location.localhost.privateKeyFile = ~/.ssh/id_rsa
-## Passphrases are supported, but not required
-# brooklyn.location.localhost.privateKeyPassphrase = s3cr3tpassphrase
-
-## Geoscaling Service - used for the Global Web Fabric demo
-## see: the global web example at brooklyn.io
-## https://www.geoscaling.com/dns2/
-## other services may take similar configuration similarly; or can usually be set in YAML
-# brooklyn.geoscaling.username = USERNAME
-# brooklyn.geoscaling.password = PASSWORD
-# brooklyn.geoscaling.primaryDomain = DOMAIN
-
-
-
########################## Getting Started Complete! ###################################
# That's it, although you may want to read through these options...
+
################################ Brooklyn Options ########################################
## Brooklyn Management Base Directory: specify where management data should be stored on this server;
@@ -115,11 +80,12 @@ brooklyn.location.jclouds.aws-ec2.credential = <access-key-hex-digits>
## Misc Cloud Settings
## brooklyn will fail a node if the cloud machine doesn't come up, but you can tell it to retry:
# brooklyn.location.jclouds.machineCreateAttempts = 3
-## many cloud machines don't have sufficient entropy for lots of encrypted networking, so fake it:
-# brooklyn.location.jclouds.installDevUrandom=true
+## many cloud machines don't have sufficient entropy for lots of encrypted networking, so
+## the default is to use /dev/urandom; disable that (to use /dev/random) by setting this to false:
+# brooklyn.location.jclouds.installDevUrandom=false
-## Sets a minimium ram property for all jclouds locations. Recommended to avoid getting m1.micros on AWS!
-brooklyn.location.jclouds.minRam = 2048
+## Sets a minimium ram property for all jclouds locations. Recommended to avoid getting tiny machines!
+# brooklyn.location.jclouds.minRam = 2048
## When setting up a new cloud machine Brooklyn creates a user with the same name as the user running
## Brooklyn on the management server, but you can force a different user here:
@@ -127,10 +93,63 @@ brooklyn.location.jclouds.minRam = 2048
## And you can force a password or key (by default it will use the keys in ~/.ssh/id_rsa{,.pub}
# brooklyn.location.jclouds.password=s3cr3t
+
+############################ Deploying to Localhost #####################################
+
+## Deploying to Localhost
+## see: info on locations at http://brooklyn.apache.org/v/latest/ops/locations/index.html#localhost
+##
+## Brooklyn defaults to using ~/.ssh/id_rsa, if it exists.
+# brooklyn.location.localhost.privateKeyFile = ~/.ssh/id_rsa
+## Passphrases are supported, but not required
+# brooklyn.location.localhost.privateKeyPassphrase = s3cr3tpassphrase
+
+
+################################## Geoscaling ###########################################
+
+## Entities can retrieve their configuration from brooklyn.properties. However, it is
+## more common to set this configuration in the blueprint's YAML.
+
+## The Geoscaling Service - used for the Global Web Fabric demo - can read the following
+## configurat (see http://www.geoscaling.com/dns2/)
+# brooklyn.geoscaling.username = USERNAME
+# brooklyn.geoscaling.password = PASSWORD
+# brooklyn.geoscaling.primaryDomain = DOMAIN
+
+
+############################# Locations Credentials #####################################
+
+## Best practice is to add locations to the catalog, rather than configuring locations
+## in brooklyn.properties. We also recommend using a proper credentials store, such as
+## Vault.
+##
+## However, brooklyn.properties is supported. Example configurations are shown below.
+
+## Amazon EC2 Credentials
+## These should be an "Access Key ID" and "Secret Access Key" for your account.
+## See http://docs.aws.amazon.com/IAM/latest/UserGuide/ManagingCredentials.html
+# brooklyn.location.jclouds.aws-ec2.identity = AKA_YOUR_ACCESS_KEY_ID
+# brooklyn.location.jclouds.aws-ec2.credential = <access-key-hex-digits>
+
+## Beware of trailing spaces in your cloud credentials. This will cause unexpected
+## 401: unauthorized responses.
+
+## Using Other Clouds
+## 1. Cast your eyes down this document to find your preferred cloud in the Named Locations
+## section, and the examples.
+## 2. Uncomment the relevant line(s) for your provider.
+## 3. ADD -.identity and -.credential lines for your provider, similar to the AWS ones above,
+## replacing 'aws-ec2' with jcloud's id for your cloud.
+
+
################################ Named Locations ########################################
-# Named locations appear in the web console. If using the command line or YAML it may be
-# just as easy to use the jclouds:<provider> locations and specify additional properties there.
+## Best practice is to add locations to the catalog, rather than using named locations in
+## brooklyn.properties. However, the latter approach is supported. Example configurations
+## are shown below.
+
+## Named locations appear in the web console. If using the command line or YAML it may be
+## just as easy to use the jclouds:<provider> locations and specify additional properties there.
## Example: AWS Virginia using Rightscale 6.3 64bit Centos AMI and Large Instances
# brooklyn.location.named.aws-va-centos-large = jclouds:aws-ec2:us-east-1
@@ -147,10 +166,10 @@ brooklyn.location.jclouds.minRam = 2048
# brooklyn.location.named.aws-acct-two-singapore.displayName = AWS Singapore (Acct Two)
# For convenience some common defaults:
-brooklyn.location.named.aws-california = jclouds:aws-ec2:us-west-1
-brooklyn.location.named.aws-oregon = jclouds:aws-ec2:us-west-2
-brooklyn.location.named.aws-ireland = jclouds:aws-ec2:eu-west-1
-brooklyn.location.named.aws-tokyo = jclouds:aws-ec2:ap-northeast-1
+# brooklyn.location.named.aws-california = jclouds:aws-ec2:us-west-1
+# brooklyn.location.named.aws-oregon = jclouds:aws-ec2:us-west-2
+# brooklyn.location.named.aws-ireland = jclouds:aws-ec2:eu-west-1
+# brooklyn.location.named.aws-tokyo = jclouds:aws-ec2:ap-northeast-1
## Google Compute
## The credentials for GCE come from the "APIs & auth -> Credentials" page,
@@ -173,16 +192,6 @@ brooklyn.location.named.aws-tokyo = jclouds:aws-ec2:ap-northeast-1
## gce images often start with iptables turned on; turn it off unless your blueprints are iptables-aware
# brooklyn.location.jclouds.google-compute-engine.stopIptables=true
-## HP Cloud - also Ubuntu 12.04 LTS
-## You specify your HP Credentials like this:
-# brooklyn.location.jclouds.hpcloud-compute.identity = projectname:username
-# brooklyn.location.jclouds.hpcloud-compute.credential = password
-## where username and password are the same as logging in to the web console, and
-## projectname can be found here: https://account.hpcloud.com/projects
-# brooklyn.location.named.HP\ Cloud\ Arizona-1 = jclouds:hpcloud-compute:az-1.region-a.geo-1
-# brooklyn.location.named.HP\ Cloud\ Arizona-1.imageId = az-1.region-a.geo-1/75845
-# brooklyn.location.named.HP\ Cloud\ Arizona-1.user = ubuntu
-
## Softlayer - need a key from the gui, under "administrative -> user administration -> api-access
# brooklyn.location.jclouds.softlayer.identity=username
# brooklyn.location.jclouds.softlayer.credential=<private-key-hex-digits>
@@ -195,7 +204,7 @@ brooklyn.location.named.aws-tokyo = jclouds:aws-ec2:ap-northeast-1
## Brooklyn uses the jclouds multi-cloud library to access many clouds.
-## http://www.jclouds.org/documentation/reference/supported-providers/
+## https://jclouds.apache.org/reference/providers/#compute
## Templates for many other clouds, but remember to add identity and credentials:
@@ -311,27 +320,28 @@ brooklyn.location.named.aws-tokyo = jclouds:aws-ec2:ap-northeast-1
## abiquo identity and credential are your login username/passed
# brooklyn.location.named.My\ Abiquo=jclouds:abiquo:http://demonstration.abiquo.com/api/
+
############################### Formatting Guide #######################################
-! Both # and ! mark lines as comments
+## Both # and ! mark lines as comments
# The follow syntax are ALL valid.
# example_key example_value
# example_key : example_value
# example_key = example_value
# example_key=example_value
-# The backslash below tells Brooklyn to continue reading the value onto the next line.
+## The backslash below tells Brooklyn to continue reading the value onto the next line.
# example_key = A very \
# long string!
-# Note all white space before 'long...' is ignored. Also '!' is kept as part of the string
+## Note all white space before 'long...' is ignored. Also '!' is kept as part of the string
-# Keys with spaces should be escaped with backslashes.
-# This is useful for named locations, as the name displayed in Brooklyn's web
-# interface is derived from the key name.
+## Keys with spaces should be escaped with backslashes.
+## This is useful for named locations, as the name displayed in Brooklyn's web-console
+## is derived from the key name.
# key\ with\ spaces = some\ value
-# Encoding for .properties must be ISO-8859-1, aka Latin-1.
-# All non-latin1 characters must be entered using unicode escape characters
+## Encoding for .properties must be ISO-8859-1, aka Latin-1.
+## All non-latin1 characters must be entered using unicode escape characters
# polish_pangram = P\u00F3jd\u017A\u017Ce, ki\u0144 \
# t\u0119 chmurno\u015B\u0107 w g\u0142\u0105b flaszy!
[4/4] brooklyn-docs git commit: Closes #83
Posted by sv...@apache.org.
Closes #83
Merge remote-tracking branch 'upstream/pr/83'
Makes lots of updates related to us now being a top-level project, and no
longer in the Incubator.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/14d2c360
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/14d2c360
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/14d2c360
Branch: refs/heads/master
Commit: 14d2c36058ce903bde3ac1c20bc20e0a2cca5a57
Parents: c0bc42a b08fded
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Wed Oct 26 08:58:56 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Wed Oct 26 08:58:56 2016 +0300
----------------------------------------------------------------------
.../release-process/environment-variables.md | 10 +-
.../committers/release-process/index.md | 8 +-
.../release-process/make-release-artifacts.md | 33 +++----
.../committers/release-process/prerequisites.md | 25 +++--
.../committers/release-process/publish-temp.md | 20 +++-
.../committers/release-process/publish.md | 18 +++-
.../release-process/release-version.md | 41 +++++---
.../committers/release-process/vote-ipmc.md | 99 --------------------
.../committers/release-process/vote.md | 6 +-
9 files changed, 104 insertions(+), 156 deletions(-)
----------------------------------------------------------------------
[3/4] brooklyn-docs git commit: Closes #107
Posted by sv...@apache.org.
Closes #107
Tidy up example brooklyn.properties
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/c0bc42a4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/c0bc42a4
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/c0bc42a4
Branch: refs/heads/master
Commit: c0bc42a4c6506f4f73726ae3439bcdfe009fa9bf
Parents: 0ae570a bde6d2e
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Wed Oct 26 08:55:54 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Wed Oct 26 08:55:54 2016 +0300
----------------------------------------------------------------------
guide/start/brooklyn.properties | 154 +++++++++++++++++++----------------
1 file changed, 82 insertions(+), 72 deletions(-)
----------------------------------------------------------------------