date:20191205

[brooklyn-library] branch master updated: Fixes ansible runAnsible task

2019-12-05 Thread tbouron

This is an automated email from the ASF dual-hosted git repository.

tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git


The following commit(s) were added to refs/heads/master by this push:
 new 4b77d7f  Fixes ansible runAnsible task
 new 8347b1e  Merge pull request #174 from nakomis/fix/ansible
4b77d7f is described below

commit 4b77d7fa884486ff891139490d978f9bc8cc
Author: Martin Harris 
AuthorDate: Thu Jun 27 13:37:37 2019 +0100

Fixes ansible runAnsible task
---
 .../org/apache/brooklyn/entity/cm/ansible/AnsiblePlaybookTasks.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsiblePlaybookTasks.java
 
b/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsiblePlaybookTasks.java
index a574f35..fffbcea 100644
--- 
a/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsiblePlaybookTasks.java
+++ 
b/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsiblePlaybookTasks.java
@@ -71,7 +71,7 @@ public class AnsiblePlaybookTasks {
 public static TaskFactory runAnsible(final String dir, Object 
extraVars, String playbookName) {
 String cmd = sudo(String.format("ansible-playbook "
 + optionalExtraVarsParameter(extraVars)
-+ " -s %s.yaml", playbookName));
++ " -b %s.yaml", playbookName));
 
 if (LOG.isDebugEnabled()) {
 LOG.debug("Ansible command: {}", cmd);

[brooklyn-ui] branch master updated (7bfa16e -> bb17638)

2019-12-05 Thread tbouron

This is an automated email from the ASF dual-hosted git repository.

tbouron pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git.


from 7bfa16e  Make sure /.config and /.npm directory are writable for all 
users.
 new 5dffd11  corrects pagination issue
 new cebcf58  changes following code review
 new 00a214d  change selector
 new 69d8d56  correct selector
 new bb17638  Merge pull request #148 from frogfather/correct-pagination

The 1694 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../catalog-selector/catalog-selector.directive.js | 14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

[brooklyn-client] branch master updated: Reuse local maven cache + add PR comment trigger

2019-12-05 Thread tbouron

This is an automated email from the ASF dual-hosted git repository.

tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-client.git


The following commit(s) were added to refs/heads/master by this push:
 new 0f56b31  Reuse local maven cache + add PR comment trigger
 new 0c02b7b  Merge pull request #80 from tbouron/feature/jenkins
0f56b31 is described below

commit 0f56b319709e709474dba6d145077632f464e6fb
Author: Thomas Bouron 
AuthorDate: Thu Dec 5 10:27:55 2019 +

Reuse local maven cache + add PR comment trigger
---
 Jenkinsfile | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 05aca28..50bc00b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,6 +18,12 @@
  */
 
 node(label: 'ubuntu') {
+properties([
+pipelineTriggers([
+issueCommentTrigger('.*test this please.*')
+])
+])
+
 catchError {
 def environmentDockerImage
 
@@ -36,7 +42,7 @@ node(label: 'ubuntu') {
 }
 
 stage('Run tests') {
-environmentDockerImage.inside('-i --name 
brooklyn-${DOCKER_TAG} --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
+environmentDockerImage.inside('-i --name 
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
 sh 'mvn clean install -Duser.home=/var/maven 
-Duser.name=jenkins'
 }
 }
@@ -44,12 +50,10 @@ node(label: 'ubuntu') {
 // Conditional stage to deploy artifacts, when not building a PR
 if (env.CHANGE_ID == null) {
 stage('Deploy artifacts') {
-environmentDockerImage.inside('-i --name 
brooklyn-${DOCKER_TAG} --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
+environmentDockerImage.inside('-i --name 
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
 sh 'mvn deploy -DskipTests -Duser.home=/var/maven 
-Duser.name=jenkins'
 }
 }
-
-// TODO: Publish docker image to 
https://hub.docker.com/r/apache/brooklyn/ ?
 }
 }
 }

[brooklyn-server] branch master updated: Reuse local maven cache + add PR comment trigger

2019-12-05 Thread tbouron

This is an automated email from the ASF dual-hosted git repository.

tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


The following commit(s) were added to refs/heads/master by this push:
 new b3c9759  Reuse local maven cache + add PR comment trigger
 new 0a01c97  Merge pull request #1072 from tbouron/feature/jenkins
b3c9759 is described below

commit b3c975956fc508fb0a8d2828cf7342ad50e9cdca
Author: Thomas Bouron 
AuthorDate: Thu Dec 5 10:24:34 2019 +

Reuse local maven cache + add PR comment trigger
---
 Jenkinsfile | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 05aca28..50bc00b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,6 +18,12 @@
  */
 
 node(label: 'ubuntu') {
+properties([
+pipelineTriggers([
+issueCommentTrigger('.*test this please.*')
+])
+])
+
 catchError {
 def environmentDockerImage
 
@@ -36,7 +42,7 @@ node(label: 'ubuntu') {
 }
 
 stage('Run tests') {
-environmentDockerImage.inside('-i --name 
brooklyn-${DOCKER_TAG} --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
+environmentDockerImage.inside('-i --name 
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
 sh 'mvn clean install -Duser.home=/var/maven 
-Duser.name=jenkins'
 }
 }
@@ -44,12 +50,10 @@ node(label: 'ubuntu') {
 // Conditional stage to deploy artifacts, when not building a PR
 if (env.CHANGE_ID == null) {
 stage('Deploy artifacts') {
-environmentDockerImage.inside('-i --name 
brooklyn-${DOCKER_TAG} --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
+environmentDockerImage.inside('-i --name 
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
 sh 'mvn deploy -DskipTests -Duser.home=/var/maven 
-Duser.name=jenkins'
 }
 }
-
-// TODO: Publish docker image to 
https://hub.docker.com/r/apache/brooklyn/ ?
 }
 }
 }

[brooklyn-library] branch master updated: Reuse local maven cache + add PR comment trigger

2019-12-05 Thread tbouron

This is an automated email from the ASF dual-hosted git repository.

tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git


The following commit(s) were added to refs/heads/master by this push:
 new 09b8f68  Reuse local maven cache + add PR comment trigger
 new 56d817d  Merge pull request #176 from tbouron/feature/jenkins
09b8f68 is described below

commit 09b8f68d170cef63fc8eab92f3063efe8dd97196
Author: Thomas Bouron 
AuthorDate: Thu Dec 5 10:26:05 2019 +

Reuse local maven cache + add PR comment trigger
---
 Jenkinsfile | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 05aca28..50bc00b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,6 +18,12 @@
  */
 
 node(label: 'ubuntu') {
+properties([
+pipelineTriggers([
+issueCommentTrigger('.*test this please.*')
+])
+])
+
 catchError {
 def environmentDockerImage
 
@@ -36,7 +42,7 @@ node(label: 'ubuntu') {
 }
 
 stage('Run tests') {
-environmentDockerImage.inside('-i --name 
brooklyn-${DOCKER_TAG} --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
+environmentDockerImage.inside('-i --name 
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
 sh 'mvn clean install -Duser.home=/var/maven 
-Duser.name=jenkins'
 }
 }
@@ -44,12 +50,10 @@ node(label: 'ubuntu') {
 // Conditional stage to deploy artifacts, when not building a PR
 if (env.CHANGE_ID == null) {
 stage('Deploy artifacts') {
-environmentDockerImage.inside('-i --name 
brooklyn-${DOCKER_TAG} --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
+environmentDockerImage.inside('-i --name 
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
 sh 'mvn deploy -DskipTests -Duser.home=/var/maven 
-Duser.name=jenkins'
 }
 }
-
-// TODO: Publish docker image to 
https://hub.docker.com/r/apache/brooklyn/ ?
 }
 }
 }

[brooklyn] branch master updated: Add jenkinsfile for multibranch job on Jenkins

2019-12-05 Thread tbouron

This is an automated email from the ASF dual-hosted git repository.

tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn.git


The following commit(s) were added to refs/heads/master by this push:
 new ae872cd  Add jenkinsfile for multibranch job on Jenkins
 new 4a83d86  Merge pull request #33 from tbouron/master
ae872cd is described below

commit ae872cda08b0a5ed5662597162cd17032df9b075
Author: Thomas Bouron 
AuthorDate: Tue Dec 3 11:33:28 2019 +

Add jenkinsfile for multibranch job on Jenkins
---
 Dockerfile  | 11 ++-
 Jenkinsfile | 23 +++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d681655..0f8f2b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,8 @@ RUN apt-get update && apt-get install -y \
 rpm \
 dpkg \
 libpng-dev \
+libjpeg-progs \
+pngquant \
 make \
 automake \
 autoconf \
@@ -39,6 +41,13 @@ RUN apt-get update && apt-get install -y \
 nasm \
 gcc
 
-# For mvn-build
+# Make sure the /.config && /.npm (for UI module builds) is writable for all 
users
+RUN mkdir -p /.config && chmod -R 777 /.config
+RUN mkdir -p /.npm && chmod -R 777 /.npm
+
+# Make sure the /var/tmp (for RPM build) is writable for all users
+RUN mkdir -p /var/tmp/ && chmod -R 777 /var/tmp/
+
+# Make sure the /var/maven is writable for all users
 RUN mkdir -p /var/maven/.m2/ && chmod -R 777 /var/maven/
 ENV MAVEN_CONFIG=/var/maven/.m2
diff --git a/Jenkinsfile b/Jenkinsfile
index c41da46..4461e53 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,6 +18,21 @@
  */
 
 node(label: 'ubuntu') {
+def triggers = []
+if (env.CHANGE_ID) {
+triggers.push(issueCommentTrigger('.*test this please.*'))
+}
+if (env.BRANCH_NAME == 'master') {
+triggers.push(upstream(
+threshold: 'SUCCESS',
+upstreamProjects: '../brooklyn-server/master, 
../brooklyn-library/master, ../brooklyn-ui/master, ../brooklyn-client/master, 
../brooklyn-dist/master'
+))
+}
+
+properties([
+pipelineTriggers(triggers)
+])
+
 catchError {
 def environmentDockerImage
 
@@ -38,16 +53,16 @@ node(label: 'ubuntu') {
 }
 
 stage('Run tests') {
-environmentDockerImage.inside('-i --rm --name 
brooklyn-${DOCKER_TAG} --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
-sh 'mvn clean install -Duser.home=/var/maven 
-Duser.name=jenkins'
+environmentDockerImage.inside('-i --name 
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
+sh 'mvn clean install -Prpm -Pdeb -Duser.home=/var/maven 
-Duser.name=jenkins'
 }
 }
 
 // Conditional stage to deploy artifacts, when not building a PR
 if (env.CHANGE_ID == null) {
 stage('Deploy artifacts') {
-environmentDockerImage.inside('-i --rm --name 
brooklyn-${DOCKER_TAG} --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
-sh 'mvn deploy -DskipTests -Duser.home=/var/maven 
-Duser.name=jenkins'
+environmentDockerImage.inside('-i --name 
brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount 
type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly
 -v ${WORKSPACE}:/usr/build -w /usr/build') {
+sh 'mvn deploy -Prpm -Pdeb -DskipTests 
-Duser.home=/var/maven -Duser.name=jenkins'
 }
 }
 }

[brooklyn-docs] branch dependabot/npm_and_yarn/nwmatcher-1.4.4 created (now 0109e62)

2019-12-05 Thread github-bot

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch dependabot/npm_and_yarn/nwmatcher-1.4.4
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git.


  at 0109e62  Bump nwmatcher from 1.4.2 to 1.4.4

No new revisions were added by this update.

[brooklyn-docs] branch master updated: Updates localhost doc to add a deployable example

2019-12-05 Thread tbouron

This is an automated email from the ASF dual-hosted git repository.

tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git


The following commit(s) were added to refs/heads/master by this push:
 new 3ac4d4f  Updates localhost doc to add a deployable example
 new 5237ea6  Merge pull request #295 from nakomis/clarify-localhost
3ac4d4f is described below

commit 3ac4d4f7018f36608f9dfa728a46dc1b17e2883c
Author: Martin Harris 
AuthorDate: Tue Dec 3 14:10:41 2019 +

Updates localhost doc to add a deployable example

Also bumps some of the dependencies, which was required
to build the docs
---
 .gitignore|2 +-
 guide/locations/_localhost.md |6 +
 package-lock.json | 2155 +
 package.json  |3 +-
 4 files changed, 1102 insertions(+), 1064 deletions(-)

diff --git a/.gitignore b/.gitignore
index b0f4fbc..17e5bc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,4 @@ nb-configuration.xml
 _book
 node_modules
 javadoc/stylesheet.css
-javadoc/javadoc.log
\ No newline at end of file
+javadoc/javadoc.log
diff --git a/guide/locations/_localhost.md b/guide/locations/_localhost.md
index bafab8c..77a65cd 100644
--- a/guide/locations/_localhost.md
+++ b/guide/locations/_localhost.md
@@ -4,6 +4,12 @@ If passwordless ssh login to `localhost` and passwordless 
`sudo` is enabled on y
 machine, you should be able to deploy some blueprints with no special 
configuration,
 just by specifying `location: localhost` in YAML.
 
+For example:
+
+location: localhost
+services:
+- type: org.apache.brooklyn.entity.database.mysql.MySqlNode
+
 If you use a passphrase or prefer a different key, these can be configured as 
follows:
 
 location:
diff --git a/package-lock.json b/package-lock.json
index 7823ee4..8acc22b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,8 @@
   "version": "2.7.0",
   "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz";,
   "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
-  "dev": true
+  "dev": true,
+  "optional": true
 },
 "acorn-globals": {
   "version": "1.0.9",
@@ -24,7 +25,7 @@
   "dev": true,
   "optional": true,
   "requires": {
-"acorn": "2.7.0"
+"acorn": "^2.1.0"
   }
 },
 "ajv": {
@@ -34,10 +35,10 @@
   "dev": true,
   "optional": true,
   "requires": {
-"co": "4.6.0",
-"fast-deep-equal": "1.0.0",
-"json-schema-traverse": "0.3.1",
-"json-stable-stringify": "1.0.1"
+"co": "^4.6.0",
+"fast-deep-equal": "^1.0.0",
+"json-schema-traverse": "^0.3.0",
+"json-stable-stringify": "^1.0.1"
   }
 },
 "amdefine": {
@@ -55,17 +56,21 @@
   "optional": true
 },
 "asn1": {
-  "version": "0.2.3",
-  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";,
-  "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+  "version": "0.2.4",
+  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";,
+  "integrity": 
"sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
   "dev": true,
-  "optional": true
+  "optional": true,
+  "requires": {
+"safer-buffer": "~2.1.0"
+  }
 },
 "assert-plus": {
   "version": "1.0.0",
   "resolved": 
"https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";,
   "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-  "dev": true
+  "dev": true,
+  "optional": true
 },
 "asynckit": {
   "version": "0.4.0",
@@ -95,13 +100,13 @@
   "dev": true
 },
 "bcrypt-pbkdf": {
-  "version": "1.0.1",
-  "resolved": 
"https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";,
-  "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+  "version": "1.0.2",
+  "resolved": 
"https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";,
+  "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
   "dev": true,
   "optional": true,
   "requires": {
-"tweetnacl": "0.14.5"
+"tweetnacl": "^0.14.3"
   }
 },
 "boolbase": {
@@ -117,7 +122,7 @@
   "dev": true,
   "optional": true,
   "requires": {
-"hoek": "4.2.0"
+"hoek": "4.x.x"
   }
 },
 "caseless": {
@@ -133,12 +138,12 @@
   "integrity": "sha1-XHEPK6uVZTJyhCugHG6mGzVF7DU=",
   "dev": true,
   "requires": {
-"css-select": "1.2.0",
-"dom-serializer": "0.1.0",
-"entities": "1.1.1",
-"htmlparser2": "3.8.3",
-"jsdom": "7.2.2",
-"lodash": "4.12.0"
+"css-select": "~1.2.0",
+"dom-serializer": "~0.1.0",
+"entities": "~1.1.1",
+"htmlparser2": "~3.8.1",
+"jsdom": "^7.0.2",
+"lodash": "^4.1.0"

[brooklyn-library] branch master updated: Fixes ansible runAnsible task

[brooklyn-ui] branch master updated (7bfa16e -> bb17638)

[brooklyn-client] branch master updated: Reuse local maven cache + add PR comment trigger

[brooklyn-server] branch master updated: Reuse local maven cache + add PR comment trigger

[brooklyn-library] branch master updated: Reuse local maven cache + add PR comment trigger

[brooklyn] branch master updated: Add jenkinsfile for multibranch job on Jenkins

[brooklyn-docs] branch dependabot/npm_and_yarn/nwmatcher-1.4.4 created (now 0109e62)

[brooklyn-docs] branch master updated: Updates localhost doc to add a deployable example

8 matches

Site Navigation

Mail list logo

Footer information