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 2019/12/20 16:19:48 UTC
[brooklyn-dist] branch master updated (10953ee -> 27fd652)
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git.
from 10953ee Merge pull request #147 from tbouron/tbouron-patch-1
new 9e47642 Update dockerfile, entrypoint.sh and Jenkinsfile to correctly run integration tests on Jenkins
new dadcf3e This closes #144
add 16a3d3f Remove MD5 and SHA-1 checksums from release scripts
new e4eedae Merge branch 'master' into remove-md5-sha1
new 033633e add rpm and deb build flags
new bd642a1 make sure environment.sh exports its variables to the env
new 185bafe add -Dclient to make_release_script.sh
new ab40e59 don't ignore cli vendor directory in copying source files
new 88d41e4 This closes #150
new df2952c Update Jenkinsfile to: - add the pipeline trigger on comment only if we are building a PR - not deploy artifacts when building master. This will be taken care of during the full brooklyn build on master (see Jenkinsfile configuration at the brooklyn root)
new 27fd652 This closes #151
The 10 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:
Jenkinsfile | 19 +++++----------
docker-itest/Dockerfile | 49 +++++++++++++++++++++++++++++++++------
docker-itest/Jenkinsfile | 25 ++++++++------------
docker-itest/entrypoint.sh | 2 +-
release/environment.sh | 12 +++++-----
release/make-release-artifacts.sh | 12 ++++------
release/verify_brooklyn_rc.sh | 11 ++++-----
7 files changed, 73 insertions(+), 57 deletions(-)
[brooklyn-dist] 06/10: add -Dclient to make_release_script.sh
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 185bafe48b836c9d231519f294a7e9c2d1ecda3a
Author: Geoff Macartney <ge...@gmail.com>
AuthorDate: Thu Dec 19 19:48:40 2019 +0000
add -Dclient to make_release_script.sh
---
release/make-release-artifacts.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index 7676651..fc2041c 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -200,9 +200,9 @@ mkdir -p ${bin_staging_dir}
# Perform the build
if [ -z "${dry_run}" ]; then
- ( cd ${src_staging_dir} && mvn deploy -Drpm -Ddeb -Papache-release )
+ ( cd ${src_staging_dir} && mvn deploy -Dclient -Drpm -Ddeb -Papache-release )
else
- ( cd ${src_staging_dir} && mvn install -Drpm -Ddeb -Papache-release )
+ ( cd ${src_staging_dir} && mvn install -Dclient -Drpm -Ddeb -Papache-release )
fi
# Re-pack the archive with the correct names
[brooklyn-dist] 09/10: This closes #150
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 88d41e43aee62f2df6f783ba94a9662c89379b37
Merge: dadcf3e ab40e59
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Dec 20 16:19:17 2019 +0000
This closes #150
release/environment.sh | 12 ++++++------
release/make-release-artifacts.sh | 12 ++++--------
release/verify_brooklyn_rc.sh | 11 ++++-------
3 files changed, 14 insertions(+), 21 deletions(-)
[brooklyn-dist] 01/10: Update dockerfile,
entrypoint.sh and Jenkinsfile to correctly run integration tests on
Jenkins
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 9e47642c7ac1d7e5063fcb7d1aab17fee5aa01f4
Author: Thomas Bouron <th...@cloudsoftcorp.com>
AuthorDate: Tue Dec 3 14:39:22 2019 +0000
Update dockerfile, entrypoint.sh and Jenkinsfile to correctly run integration tests on Jenkins
---
docker-itest/Dockerfile | 49 +++++++++++++++++++++++++++++++++++++++-------
docker-itest/Jenkinsfile | 25 ++++++++++-------------
docker-itest/entrypoint.sh | 2 +-
3 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/docker-itest/Dockerfile b/docker-itest/Dockerfile
index d50d7fa..f23afd1 100644
--- a/docker-itest/Dockerfile
+++ b/docker-itest/Dockerfile
@@ -16,8 +16,7 @@
# under the License.
#
-FROM maven:3.3-jdk-8
-MAINTAINER Svetoslav Neykov "svetoslav.neykov@cloudsoft.io"
+FROM maven:3.5.2-jdk-8
# For Alpine:
# FROM maven:3.3.9-jdk-8-alpine
@@ -27,12 +26,37 @@ MAINTAINER Svetoslav Neykov "svetoslav.neykov@cloudsoft.io"
# making it on par with the full debian image. Also some tests fail
# because of differences in the accepted arguments of the busybox provided tools.
+# Install the non-headless JRE as some tests requires them
+RUN apt-get update && apt-get install -y openjdk-8-jre
+
+# Install necessary binaries to build brooklyn
RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends net-tools ssh sudo wget chef && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
+ git-core \
+ procps \
+ golang-go \
+ rpm \
+ dpkg \
+ libpng-dev \
+ make \
+ automake \
+ autoconf \
+ libtool \
+ dpkg \
+ pkg-config \
+ nasm \
+ gcc \
+ net-tools \
+ ssh \
+ sudo \
+ wget \
+ chef && \
rm -rf /var/lib/apt/lists/*
+
+# Prepare container for IT tests
RUN mkdir /etc/skel/.m2 && \
echo "<settings xmlns='http://maven.apache.org/SETTINGS/1.0.0'>" > /etc/skel/.m2/settings.xml && \
- echo " <localRepository>/maven-repo</localRepository>" >> /etc/skel/.m2/settings.xml && \
+ echo " <localRepository>/var/maven</localRepository>" >> /etc/skel/.m2/settings.xml && \
echo "</settings>" >> /etc/skel/.m2/settings.xml && \
: The following are integration tests requirements && \
echo "127.0.0.1 localhost1 localhost2 localhost3 localhost4" >> /etc/hosts && \
@@ -49,8 +73,19 @@ RUN mkdir /etc/skel/.m2 && \
# We need them the same so that the mounted /build volume is accessible from inside the container.
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-VOLUME /build
-VOLUME /maven-repo
+# 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
+
+VOLUME /usr/build
+VOLUME /var/maven
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-CMD ["mvn -B clean install -PIntegration"]
+CMD ["mvn -B clean test -PIntegration"]
diff --git a/docker-itest/Jenkinsfile b/docker-itest/Jenkinsfile
index 767864c..48fbbdc 100644
--- a/docker-itest/Jenkinsfile
+++ b/docker-itest/Jenkinsfile
@@ -38,12 +38,10 @@ 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') {
- 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 test -PIntegration -Duser.home=/var/maven -Duser.name=jenkins'
}
}
-
- // We don't care to deploy artifact as each git submodule build do that already
}
}
@@ -60,16 +58,13 @@ node(label: 'ubuntu') {
])
}
- // Conditional stage, when not building a PR
- if (env.CHANGE_ID == null) {
- stage('Send notifications') {
- // Send email notifications
- step([
- $class: 'Mailer',
- notifyEveryUnstableBuild: true,
- recipients: 'dev@brooklyn.apache.org',
- sendToIndividuals: false
- ])
- }
+ stage('Send notifications') {
+ // Send email notifications
+ step([
+ $class: 'Mailer',
+ notifyEveryUnstableBuild: true,
+ recipients: 'dev@brooklyn.apache.org',
+ sendToIndividuals: false
+ ])
}
}
diff --git a/docker-itest/entrypoint.sh b/docker-itest/entrypoint.sh
index b3370a7..959befb 100755
--- a/docker-itest/entrypoint.sh
+++ b/docker-itest/entrypoint.sh
@@ -41,7 +41,7 @@ else
ssh-keygen -t rsa -N "mypassphrase" -f ~/.ssh/id_rsa_with_passphrase
cat ~/.ssh/id_rsa_with_passphrase.pub >> ~/.ssh/authorized_keys
- cd /build
+ cd /usr/build
echo "Available entropy in container: $(cat /proc/sys/kernel/random/entropy_avail)"
exec $@
fi
[brooklyn-dist] 03/10: Merge branch 'master' into remove-md5-sha1
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit e4eedae5cdf6474941064698dd5d76c2b2b9581c
Merge: 16a3d3f 10953ee
Author: Geoff Macartney <ge...@gmail.com>
AuthorDate: Tue Dec 17 20:37:16 2019 +0000
Merge branch 'master' into remove-md5-sha1
Jenkinsfile | 12 ++++++++----
dist/licensing/generate-all.sh | 2 ++
dist/licensing/generate-license-and-notice.sh | 11 +++++++++++
3 files changed, 21 insertions(+), 4 deletions(-)
[brooklyn-dist] 07/10: don't ignore cli vendor directory in copying
source files
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit ab40e5978b86bf10ae217def4646c51c15f01eca
Author: Geoff Macartney <ge...@gmail.com>
AuthorDate: Thu Dec 19 23:39:51 2019 +0000
don't ignore cli vendor directory in copying source files
the vendor directory is source managed at the moment, which
makes this script easier. We can look into improving this
in a later PR.
---
release/make-release-artifacts.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index fc2041c..f12151c 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -175,9 +175,7 @@ mkdir -p ${src_staging_dir}
# * sandbox (which hasn't been vetted so thoroughly)
# * release (where this is running, and people who *have* the release don't need to make it)
# * jars and friends (these are sometimes included for tests, but those are marked as skippable,
-# * cli/vendor - that's not source controlled and not removed by mvn clean so ignore it in case it's already there
-# and apache convention does not allow them in source builds; see PR #365
-rsync -rtp --exclude .git\* --exclude brooklyn-docs/ --exclude brooklyn-library/sandbox/ --exclude brooklyn-client/cli/vendor/ --exclude brooklyn-dist/release/ --exclude '**/*.[ejw]ar' . ${staging_dir}/${release_name}-src
+rsync -rtp --exclude .git\* --exclude brooklyn-docs/ --exclude brooklyn-library/sandbox/ --exclude brooklyn-dist/release/ --exclude '**/*.[ejw]ar' . ${staging_dir}/${release_name}-src
rm -rf ${artifact_dir}
mkdir -p ${artifact_dir}
[brooklyn-dist] 05/10: make sure environment.sh exports its
variables to the env
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit bd642a172d71fefa4ea9bb341ec814ab8599bc35
Author: Geoff Macartney <ge...@gmail.com>
AuthorDate: Thu Dec 19 19:38:00 2019 +0000
make sure environment.sh exports its variables to the env
---
release/environment.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/release/environment.sh b/release/environment.sh
index 47f3280..1ddf73a 100755
--- a/release/environment.sh
+++ b/release/environment.sh
@@ -102,10 +102,10 @@ echo >&2 "The continuing version is: ${continue_version}"
confirm || exit
cat <<EOF
-OLD_MASTER_VERSION=${current_version}
-NEW_MASTER_VERSION=${continue_version}
-VERSION_NAME=${release_version}
-RC_NUMBER=${rc_suffix}
-SUBMODULES="$( perl -n -e 'if ($_ =~ /path += +(.*)$/) { print $1." " }' < .gitmodules )"
-MODULES=". \${SUBMODULES}"
+export OLD_MASTER_VERSION=${current_version}
+export NEW_MASTER_VERSION=${continue_version}
+export VERSION_NAME=${release_version}
+export RC_NUMBER=${rc_suffix}
+export SUBMODULES="$( perl -n -e 'if ($_ =~ /path += +(.*)$/) { print $1." " }' < .gitmodules )"
+export MODULES=". \${SUBMODULES}"
EOF
[brooklyn-dist] 08/10: This closes #144
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit dadcf3e3560cb0a7711012a2b80284988d93cecd
Merge: 10953ee 9e47642
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Dec 20 16:19:15 2019 +0000
This closes #144
docker-itest/Dockerfile | 49 +++++++++++++++++++++++++++++++++++++++-------
docker-itest/Jenkinsfile | 25 ++++++++++-------------
docker-itest/entrypoint.sh | 2 +-
3 files changed, 53 insertions(+), 23 deletions(-)
[brooklyn-dist] 04/10: add rpm and deb build flags
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 033633ed734aa0ffad2b0480cb6bb88d86cc33e1
Author: Geoff Macartney <ge...@gmail.com>
AuthorDate: Tue Dec 17 23:57:05 2019 +0000
add rpm and deb build flags
---
release/make-release-artifacts.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index 9e472ca..7676651 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -200,9 +200,9 @@ mkdir -p ${bin_staging_dir}
# Perform the build
if [ -z "${dry_run}" ]; then
- ( cd ${src_staging_dir} && mvn deploy -Papache-release )
+ ( cd ${src_staging_dir} && mvn deploy -Drpm -Ddeb -Papache-release )
else
- ( cd ${src_staging_dir} && mvn install -Papache-release )
+ ( cd ${src_staging_dir} && mvn install -Drpm -Ddeb -Papache-release )
fi
# Re-pack the archive with the correct names
[brooklyn-dist] 02/10: Update Jenkinsfile to: - add the pipeline
trigger on comment only if we are building a PR - not deploy artifacts when
building master. This will be taken care of during the full brooklyn build
on master (see Jenkinsfile configuration at the brooklyn root)
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit df2952cbd9e3dd0af976bc2d490c99a1b60f6b84
Author: Thomas Bouron <th...@cloudsoftcorp.com>
AuthorDate: Mon Dec 16 11:57:02 2019 +0000
Update Jenkinsfile to:
- add the pipeline trigger on comment only if we are building a PR
- not deploy artifacts when building master. This will be taken care of during the full brooklyn build on master (see Jenkinsfile configuration at the brooklyn root)
---
Jenkinsfile | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a515bfd..fc02069 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,11 +18,13 @@
*/
node(label: 'ubuntu') {
- properties([
- pipelineTriggers([
- issueCommentTrigger('.*test this please.*')
+ if (env.CHANGE_ID) {
+ properties([
+ pipelineTriggers([
+ issueCommentTrigger('.*test this please.*')
+ ])
])
- ])
+ }
catchError {
def environmentDockerImage
@@ -46,15 +48,6 @@ node(label: 'ubuntu') {
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 --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-dist] 10/10: This closes #151
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 27fd65209aca640a2c8647f24bba19a5a81a214b
Merge: 88d41e4 df2952c
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Dec 20 16:19:40 2019 +0000
This closes #151
Jenkinsfile | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)