You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@couchdb.apache.org by ba...@apache.org on 2016/01/21 22:45:05 UTC
couchdb-ci git commit: create dist tarball first and then run "make
all check" from dist tarball
Repository: couchdb-ci
Updated Branches:
refs/heads/master 9fb4f6199 -> 33ccfe725
create dist tarball first and then run "make all check" from dist tarball
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/33ccfe72
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/33ccfe72
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/33ccfe72
Branch: refs/heads/master
Commit: 33ccfe7253f648332b4ebc2ac4c146431a79c91e
Parents: 9fb4f61
Author: Bastian Krol <ba...@apache.org>
Authored: Sun Jan 10 23:28:04 2016 +0100
Committer: Bastian Krol <ba...@apache.org>
Committed: Sun Jan 10 23:28:04 2016 +0100
----------------------------------------------------------------------
ansible/roles/ubuntu-worker/files/build-ci.sh | 14 +++++++++--
ansible/roles/ubuntu-worker/tasks/couchdb.yml | 27 +++++++++++++++-------
2 files changed, 31 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/33ccfe72/ansible/roles/ubuntu-worker/files/build-ci.sh
----------------------------------------------------------------------
diff --git a/ansible/roles/ubuntu-worker/files/build-ci.sh b/ansible/roles/ubuntu-worker/files/build-ci.sh
index f6fe18a..db6993e 100755
--- a/ansible/roles/ubuntu-worker/files/build-ci.sh
+++ b/ansible/roles/ubuntu-worker/files/build-ci.sh
@@ -19,8 +19,18 @@
set -e
-cd /usr/src/couchdb
+# create a distribution tarball from the current git master branch
+cd /usr/src/couchdb-checkout
git reset --hard
git pull
./configure --with-curl
-make all check dist
+make dist
+
+# use the created tarball to build CouchDB and run tests
+cp apache-couchdb-*.tar.gz /usr/src/couchdb
+
+cd /usr/src/couchdb
+tar -xf apache-couchdb-*.tar.gz
+cd apache-couchdb-*
+./configure --with-curl
+make all check
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/33ccfe72/ansible/roles/ubuntu-worker/tasks/couchdb.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/ubuntu-worker/tasks/couchdb.yml b/ansible/roles/ubuntu-worker/tasks/couchdb.yml
index 047b5bc..c87ab5b 100644
--- a/ansible/roles/ubuntu-worker/tasks/couchdb.yml
+++ b/ansible/roles/ubuntu-worker/tasks/couchdb.yml
@@ -36,24 +36,35 @@
- name: get CouchDB sources from git
git:
repo: git://git.apache.org/couchdb.git
- dest: /usr/src/couchdb
+ dest: /usr/src/couchdb-checkout
accept_hostkey: yes
force: yes
# which branch/tag do we actually want to build? I'd say master.
# version: developer-preview-2.0
-- name: copy build script
- copy:
- src: build-ci.sh
- dest: /home/couchdb/build-ci.sh
+- name: set permissions on couchdb build
+ file:
+ path: /usr/src/couchdb-checkout
+ state: directory
owner: couchdb
group: couchdb
- mode: 0755
+ recurse: yes
-- name: set permissions on couchdb build
+# 1) `make dist` will be run in /usr/src/couchdb-checkout (this is directly
+# pulled from git
+# 2) the resulting tarball will be extracted to /usr/src/couchdb, where
+# `make all check` is run.
+- name: create directory for make check all
file:
path: /usr/src/couchdb
state: directory
owner: couchdb
group: couchdb
- recurse: yes
+
+- name: copy build script
+ copy:
+ src: build-ci.sh
+ dest: /home/couchdb/build-ci.sh
+ owner: couchdb
+ group: couchdb
+ mode: 0755