You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by om...@apache.org on 2016/04/08 18:18:39 UTC

[2/2] orc git commit: ORC-48. Generalize docker script for any branch from github. (omalley reviewed by asandryh)

ORC-48. Generalize docker script for any branch from github. (omalley
reviewed by asandryh)

This fixes #22


Project: http://git-wip-us.apache.org/repos/asf/orc/repo
Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/3c30fe85
Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/3c30fe85
Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/3c30fe85

Branch: refs/heads/master
Commit: 3c30fe85b8d6d598e110162a3bbaa2eb8b09fb82
Parents: 5f1cc8b
Author: Owen O'Malley <om...@apache.org>
Authored: Thu Apr 7 20:22:20 2016 -0700
Committer: Owen O'Malley <om...@apache.org>
Committed: Fri Apr 8 09:17:20 2016 -0700

----------------------------------------------------------------------
 docker/README     | 3 ++-
 docker/run-all.sh | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/orc/blob/3c30fe85/docker/README
----------------------------------------------------------------------
diff --git a/docker/README b/docker/README
index 461c827..cadedb2 100644
--- a/docker/README
+++ b/docker/README
@@ -2,7 +2,8 @@ These scripts are useful for testing on different versions of Linux
 assuming that you are running a version of Linux that has docker
 available.
 
-To test with multiple versions, run the run-all.sh script.
+To test against all of the Linux OSes against Apache's master branch:
+1. ./run-all.sh apache master
 
 To run the docker scripts:
 1. cd $os

http://git-wip-us.apache.org/repos/asf/orc/blob/3c30fe85/docker/run-all.sh
----------------------------------------------------------------------
diff --git a/docker/run-all.sh b/docker/run-all.sh
index 0a34b9c..79cb87b 100755
--- a/docker/run-all.sh
+++ b/docker/run-all.sh
@@ -15,11 +15,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+GITHUB_USER=$1
+URL=https://github.com/$GITHUB_USER/orc.git
+BRANCH=$2
+
 start=`date`
 for os in centos5 centos6 centos7 debian6 debian7 ubuntu12 ubuntu14; do
   echo "Testing $os"
   ( cd $os && docker build -t "orc-$os" . )
-  docker run "orc-$os" || exit 1
+  docker run "orc-$os" /bin/bash -c "git clone $URL -b $BRANCH && mkdir orc/build && cd orc/build && cmake .. && make package test-out" || exit 1
 done
 echo "Start: $start"
-echo "End:" `date`
\ No newline at end of file
+echo "End:" `date`