You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2017/06/27 09:23:35 UTC
ode git commit: Updated cibuild to use new docker image
Repository: ode
Updated Branches:
refs/heads/master 619e1f229 -> b85e5f93e
Updated cibuild to use new docker image
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/b85e5f93
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/b85e5f93
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/b85e5f93
Branch: refs/heads/master
Commit: b85e5f93ecb3117374411d4d62ea4724cd1c080f
Parents: 619e1f2
Author: sathwik <sa...@apache.org>
Authored: Tue Jun 27 14:53:15 2017 +0530
Committer: sathwik <sa...@apache.org>
Committed: Tue Jun 27 14:53:15 2017 +0530
----------------------------------------------------------------------
Gemfile | 2 ++
ci-build.sh | 39 +++++++++++++++++++++++++++++++++------
2 files changed, 35 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/b85e5f93/Gemfile
----------------------------------------------------------------------
diff --git a/Gemfile b/Gemfile
index 4933b40..bd0ed4b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,3 +7,5 @@ gem 'rspec-expectations', '= 2.14.3'
gem 'rspec-mocks', '= 2.14.3'
gem 'rspec-core', '= 2.14.5'
gem 'rspec', '= 2.14.1'
+gem 'nokogiri', '= 1.6.8'
+gem 'net-ssh', '= 2.7.0'
http://git-wip-us.apache.org/repos/asf/ode/blob/b85e5f93/ci-build.sh
----------------------------------------------------------------------
diff --git a/ci-build.sh b/ci-build.sh
index 1a590b7..4f370b0 100755
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -15,7 +15,7 @@
#!/bin/sh
-docker pull vanto/apache-buildr:latest-jruby-jdk7
+docker pull sathwik/apache-buildr:latest-jruby-jdk7
export JAVA_OPTS="-Xmx1024M -XX:MaxPermSize=512M"
BUILDR_ARGS="$@"
@@ -25,12 +25,39 @@ HOMEDIR="/home/$CONTAINER_USERNAME"
GROUP_ID=$(id -g)
USER_ID=$( id -u)
-CREATE_USER_COMMAND="groupadd -f -g $GROUP_ID $CONTAINER_GROUPNAME && useradd -u $USER_ID -g $CONTAINER_GROUPNAME $CONTAINER_USERNAME && mkdir --parent $HOMEDIR && chown -R $CONTAINER_USERNAME:$CONTAINER_GROUPNAME $HOMEDIR"
+CREATE_USER_COMMAND="groupadd -f -g $GROUP_ID $CONTAINER_GROUPNAME \
+&& useradd -u $USER_ID -g $CONTAINER_GROUPNAME $CONTAINER_USERNAME \
+&& mkdir --parent $HOMEDIR \
+&& chown -R $CONTAINER_USERNAME:$CONTAINER_GROUPNAME $HOMEDIR"
-BUNDLER_COMMAND="/opt/jruby/bin/jruby -S bundler install --gemfile=/workspace/Gemfile"
-
-BUILDR_COMMAND="su $CONTAINER_USERNAME -c '/opt/jruby/bin/jruby -S buildr $BUILDR_ARGS'"
+BUNDLER_COMMAND="jruby -S bundler install --gemfile=/workspace/Gemfile"
+
+BUILDR_COMMAND="su $CONTAINER_USERNAME -c 'buildr $BUILDR_ARGS'"
FINAL_COMMAND="$CREATE_USER_COMMAND && $BUNDLER_COMMAND && $BUILDR_COMMAND"
-docker run --rm -e JAVADOC=no -e JAVA_OPTS -v `pwd`:/workspace -v $HOME/.m2:/home/dummy/.m2 -v $HOME/.buildr:/home/dummy/.buildr -v /tmp:/tmp --entrypoint bash vanto/apache-buildr:latest-jruby-jdk7 -c "$FINAL_COMMAND"
+
+## For release set these arguments with proper values
+## export JAVADOC=on
+## export BUILDR_ENV=production
+## (Append -SNAPSHOT for ever next version)
+## export NEXT_VERSION=1.3.8-SNAPSHOT
+## export GNUPGHOME="$HOME/.gnupg"
+## export GPG_USER=
+## export GPG_PASS=
+
+## mount volume for release
+## -v $GNUPGHOME:/home/dummy/.gnupg
+
+docker run --rm \
+ -e JAVADOC=$JAVADOC \
+ -e NEXT_VERSION=$NEXT_VERSION \
+ -e GPG_USER=$GPG_USER \
+ -e GPG_PASS=$GPG_PASS \
+ -e BUILDR_ENV=$BUILDR_ENV \
+ -e JAVA_OPTS \
+ -v `pwd`:/workspace \
+ -v $HOME/.m2:/home/dummy/.m2 \
+ -v $HOME/.buildr:/home/dummy/.buildr \
+ -v /tmp:/tmp \
+--entrypoint bash sathwik/apache-buildr:latest-jruby-jdk7 -c "$FINAL_COMMAND";