You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/09/03 15:26:11 UTC
[1/3] incubator-brooklyn git commit: tips on debugging pinentry when
doing the release
Repository: incubator-brooklyn
Updated Branches:
refs/heads/0.8.0-incubating 5d9514507 -> c2ccf66b5
tips on debugging pinentry when doing the release
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8f840919
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8f840919
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8f840919
Branch: refs/heads/0.8.0-incubating
Commit: 8f84091962eb1a566fddcafa85248e0771f7cb6f
Parents: 5d95145
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 02:06:33 2015 +0100
Committer: Alex Heneveld <al...@cloudsoft.io>
Committed: Thu Sep 3 02:06:33 2015 +0100
----------------------------------------------------------------------
.../release-process/make-release-artifacts.md | 7 ++++
.../committers/release-process/prerequisites.md | 42 ++++++++++++--------
2 files changed, 33 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8f840919/docs/website/developers/committers/release-process/make-release-artifacts.md
----------------------------------------------------------------------
diff --git a/docs/website/developers/committers/release-process/make-release-artifacts.md b/docs/website/developers/committers/release-process/make-release-artifacts.md
index 886f688..26c7dbf 100644
--- a/docs/website/developers/committers/release-process/make-release-artifacts.md
+++ b/docs/website/developers/committers/release-process/make-release-artifacts.md
@@ -15,6 +15,13 @@ 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:
+
+{% highlight bash %}
+mvn clean install -Papache-release
+{% endhighlight %}
+
To run the script:
{% highlight bash %}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8f840919/docs/website/developers/committers/release-process/prerequisites.md
----------------------------------------------------------------------
diff --git a/docs/website/developers/committers/release-process/prerequisites.md b/docs/website/developers/committers/release-process/prerequisites.md
index 7c6708a..9977201 100644
--- a/docs/website/developers/committers/release-process/prerequisites.md
+++ b/docs/website/developers/committers/release-process/prerequisites.md
@@ -29,6 +29,24 @@ When working with these folders, **make sure you are working with the correct on
pre-release software to the global release mirror network!
+Software packages
+-----------------
+
+The following software packages are required during the build. Make sure you have them installed.
+
+- A Java Development Kit, version 1.7
+- `maven` and `git`
+- `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`
+- `gnupg2`, and `gnupg-agent` if it is packaged separately (it is on Ubuntu Linux)
+- `pinentry` for secure entry of GPG passphrases. If you are building remotely on a Linux machine, `pinentry-curses` is
+ recommended; building on a mac, `port install pinentry-mac` is recommended.
+- `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 "$@"`
+
+
GPG keys
--------
@@ -65,23 +83,15 @@ 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)
+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
-Software packages
------------------
-
-The following software packages are required during the build. Make sure you have them installed.
-
-- A Java Development Kit, version 1.7
-- `maven` and `git`
-- `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`
-- `pinentry` for secure entry of GPG passphrases. If you are building remotely on a Linux machine, `pinentry-curses` is
- recommended; building on a mac, `port install pinentry-mac` is recommended.
-- `gnupg2`, and `gnupg-agent` if it is packaged separately (it is on Ubuntu Linux)
-- `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 "$@"`
Maven configuration
-------------------
[2/3] incubator-brooklyn git commit: make release script takes -y and
checks for existing gpg-agent
Posted by he...@apache.org.
make release script takes -y and checks for existing gpg-agent
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/df646bee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/df646bee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/df646bee
Branch: refs/heads/0.8.0-incubating
Commit: df646beeb6cc836d3fbeb44d57ae99f017063475
Parents: 8f84091
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 02:06:47 2015 +0100
Committer: Alex Heneveld <al...@cloudsoft.io>
Committed: Thu Sep 3 02:06:47 2015 +0100
----------------------------------------------------------------------
release/make-release-artifacts.sh | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/df646bee/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index b372560..8cefc77 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -43,6 +43,8 @@ release.
include the suffix. Therefore, turning a release
candidate into a release requires only renaming
the artifacts.
+ -y answers "y" to all questions automatically, to
+ use defaults and make this suitable for batch mode
Specifying the RC number is required. Specifying the version number is
discouraged; if auto detection is not working, then this script is buggy.
@@ -53,15 +55,19 @@ END
###############################################################################
confirm() {
# call with a prompt string or use a default
- read -r -p "${1:-Are you sure? [y/N]} " response
- case $response in
+ if [ "${batch_confirm_y}" == "true" ] ; then
+ true
+ else
+ read -r -p "${1:-Are you sure? [y/N]} " response
+ case $response in
[yY][eE][sS]|[yY])
true
;;
*)
false
;;
- esac
+ esac
+ fi
}
###############################################################################
@@ -83,7 +89,7 @@ detect_version() {
# Argument parsing
rc_suffix=
OPTIND=1
-while getopts "h?v:r:" opt; do
+while getopts "h?v:r:y?" opt; do
case "$opt" in
h|\?)
show_help
@@ -95,6 +101,9 @@ while getopts "h?v:r:" opt; do
r)
rc_suffix=$OPTARG
;;
+ y)
+ batch_confirm_y=true
+ ;;
*)
show_help
exit 1
@@ -169,9 +178,13 @@ echo "Proceeding to build binary release"
set -x
# Set up GPG agent
-eval $(gpg-agent --daemon --no-grab --write-env-file $HOME/.gpg-agent-info)
-GPG_TTY=$(tty)
-export GPG_TTY GPG_AGENT_INFO
+if ps x | grep [g]pg-agent ; then
+ echo "gpg-agent already running; assuming it is set up and exported correctly."
+else
+ eval $(gpg-agent --daemon --no-grab --write-env-file $HOME/.gpg-agent-info)
+ GPG_TTY=$(tty)
+ export GPG_TTY GPG_AGENT_INFO
+fi
# Workaround for bug BROOKLYN-1
( cd ${staging_dir} && mvn clean --projects :brooklyn-archetype-quickstart )
[3/3] incubator-brooklyn git commit: allow malformed javadoc
Posted by he...@apache.org.
allow malformed javadoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c2ccf66b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c2ccf66b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c2ccf66b
Branch: refs/heads/0.8.0-incubating
Commit: c2ccf66b5934c0b408ef51dfd83d78de1c4b4118
Parents: df646be
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 02:07:06 2015 +0100
Committer: Alex Heneveld <al...@cloudsoft.io>
Committed: Thu Sep 3 02:07:06 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c2ccf66b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 81358dd..c05586f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -665,6 +665,7 @@
<author>false</author>
<quiet>true</quiet>
<aggregate>false</aggregate>
+ <failOnError>false</failOnError>
<detectLinks />
<tags>
<tag>