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 2015/03/31 17:48:58 UTC
ode git commit: Added the required buildr dependencies in Gemfile and
updated the CI build script
Repository: ode
Updated Branches:
refs/heads/master 7a985663c -> 1137320e2
Added the required buildr dependencies in Gemfile and updated the CI build script
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/1137320e
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/1137320e
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/1137320e
Branch: refs/heads/master
Commit: 1137320e28e4a23aee63cab042cd946ba388af6a
Parents: 7a98566
Author: sathwik <sa...@apache.org>
Authored: Tue Mar 31 21:18:40 2015 +0530
Committer: sathwik <sa...@apache.org>
Committed: Tue Mar 31 21:18:40 2015 +0530
----------------------------------------------------------------------
Gemfile | 4 ++++
ci-build.sh | 47 +++++++++++++++++++++++++++++++----------------
2 files changed, 35 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/1137320e/Gemfile
----------------------------------------------------------------------
diff --git a/Gemfile b/Gemfile
index 586c1c7..2013adc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,7 @@
source 'https://rubygems.org'
gem 'buildr', '>= 1.4.21'
+gem 'rspec-expectations', '= 2.14.3'
+gem 'rspec-mocks', '= 2.14.3'
+gem 'rspec-core', '= 2.14.5'
+gem 'rspec', '= 2.14.1'
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode/blob/1137320e/ci-build.sh
----------------------------------------------------------------------
diff --git a/ci-build.sh b/ci-build.sh
index 115f2f6..afb3523 100755
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -1,21 +1,36 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
-set -e
-export TEST_DUMMY_ENV_VAR=42;
-JAVA_OPTS="-XX:MaxPermSize=256m -Xmx2048m -Dlog4j.debug=true" TEST_PORTS="8888,7171" buildr _1.3.5_ clean test
+#!/bin/sh
-echo SUCCESS
+docker pull vanto/apache-buildr:latest-jruby-jdk7
+export JAVA_OPTS="-Xmx1024M -XX:MaxPermSize=512M"
+BUILDR_ARGS="$@"
+CONTAINER_USERNAME="dummy"
+CONTAINER_GROUPNAME="dummy"
+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"
+
+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'"
+
+FINAL_COMMAND="$CREATE_USER_COMMAND && $BUNDLER_COMMAND && $BUILDR_COMMAND"
+
+docker run --rm -t -i -e JAVADOC=no -e JAVA_OPTS -v `pwd`:/workspace -v $HOME/.m2:/home/dummy/.m2 -v /tmp:/tmp --entrypoint bash vanto/apache-buildr:latest-jruby-jdk7 -c "$FINAL_COMMAND"
\ No newline at end of file