You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@couchdb.apache.org by wo...@apache.org on 2017/04/27 06:51:26 UTC
[1/5] couchdb-ci git commit: Change build user to builder
Repository: couchdb-ci
Updated Branches:
refs/heads/master 52090f9cb -> 67d84506e
Change build user to builder
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/c68372a0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/c68372a0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/c68372a0
Branch: refs/heads/master
Commit: c68372a017b1f3504c1be7011766b1d56a2417a4
Parents: 52090f9
Author: Joan Touzet <wo...@apache.org>
Authored: Tue Apr 11 21:48:17 2017 -0700
Committer: Joan Touzet <wo...@apache.org>
Committed: Tue Apr 11 21:48:17 2017 -0700
----------------------------------------------------------------------
ansible/roles/common/tasks/couchdb.yml | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/c68372a0/ansible/roles/common/tasks/couchdb.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/common/tasks/couchdb.yml b/ansible/roles/common/tasks/couchdb.yml
index a26ef04..37c748c 100644
--- a/ansible/roles/common/tasks/couchdb.yml
+++ b/ansible/roles/common/tasks/couchdb.yml
@@ -15,16 +15,16 @@
# specific language governing permissions and limitations
# under the License.
-- name: create couchdb group
+- name: create builder group
group:
- name: couchdb
+ name: builder
state: present
-- name: create couchdb user
+- name: create builder user
user:
- name: couchdb
+ name: builder
createhome: yes
- group: couchdb
+ group: builder
state: present
- name: install grunt-cli
@@ -44,8 +44,8 @@
file:
path: /usr/src/couchdb-checkout
state: directory
- owner: couchdb
- group: couchdb
+ owner: builder
+ group: builder
recurse: yes
# 1) `make dist` will be run in /usr/src/couchdb-checkout (this is directly
@@ -56,13 +56,13 @@
file:
path: /usr/src/couchdb
state: directory
- owner: couchdb
- group: couchdb
+ owner: builder
+ group: builder
- name: copy build script
copy:
src: build-ci.sh
- dest: /home/couchdb/build-ci.sh
- owner: couchdb
- group: couchdb
+ dest: /home/builder/build-ci.sh
+ owner: builder
+ group: builder
mode: 0755
[2/5] couchdb-ci git commit: squash me
Posted by wo...@apache.org.
squash me
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/e9fefb6b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/e9fefb6b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/e9fefb6b
Branch: refs/heads/master
Commit: e9fefb6b21663033ea4b46354dd0bfa8538f9dc1
Parents: c68372a
Author: Joan Touzet <wo...@apache.org>
Authored: Tue Apr 11 22:04:18 2017 -0700
Committer: Joan Touzet <wo...@apache.org>
Committed: Tue Apr 11 22:04:18 2017 -0700
----------------------------------------------------------------------
ansible/roles/common/tasks/couchdb.yml | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/e9fefb6b/ansible/roles/common/tasks/couchdb.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/common/tasks/couchdb.yml b/ansible/roles/common/tasks/couchdb.yml
index 37c748c..5e44b5d 100644
--- a/ansible/roles/common/tasks/couchdb.yml
+++ b/ansible/roles/common/tasks/couchdb.yml
@@ -15,16 +15,16 @@
# specific language governing permissions and limitations
# under the License.
-- name: create builder group
+- name: create build group
group:
- name: builder
+ name: build
state: present
-- name: create builder user
+- name: create build user
user:
- name: builder
+ name: build
createhome: yes
- group: builder
+ group: build
state: present
- name: install grunt-cli
@@ -44,8 +44,8 @@
file:
path: /usr/src/couchdb-checkout
state: directory
- owner: builder
- group: builder
+ owner: build
+ group: build
recurse: yes
# 1) `make dist` will be run in /usr/src/couchdb-checkout (this is directly
@@ -56,13 +56,13 @@
file:
path: /usr/src/couchdb
state: directory
- owner: builder
- group: builder
+ owner: build
+ group: build
- name: copy build script
copy:
src: build-ci.sh
- dest: /home/builder/build-ci.sh
- owner: builder
- group: builder
+ dest: /home/build/build-ci.sh
+ owner: build
+ group: build
mode: 0755
[3/5] couchdb-ci git commit: squash me too
Posted by wo...@apache.org.
squash me too
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/ff7e9389
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/ff7e9389
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/ff7e9389
Branch: refs/heads/master
Commit: ff7e9389c628b243c040299130c7883bf0a5d16b
Parents: e9fefb6
Author: Joan Touzet <wo...@apache.org>
Authored: Tue Apr 11 22:21:21 2017 -0700
Committer: Joan Touzet <wo...@apache.org>
Committed: Tue Apr 11 22:21:21 2017 -0700
----------------------------------------------------------------------
dockerfiles/centos-6-erlang-18.3 | 4 ++--
dockerfiles/centos-6-erlang-default | 4 ++--
dockerfiles/centos-7-erlang-18.3 | 4 ++--
dockerfiles/centos-7-erlang-default | 4 ++--
dockerfiles/debian-8-erlang-18.3 | 4 ++--
dockerfiles/debian-8-erlang-default | 4 ++--
dockerfiles/ubuntu-12.04-erlang-18.3 | 4 ++--
dockerfiles/ubuntu-12.04-erlang-default | 4 ++--
dockerfiles/ubuntu-14.04-erlang-18.3 | 4 ++--
dockerfiles/ubuntu-14.04-erlang-default | 4 ++--
dockerfiles/ubuntu-16.04-erlang-18.3 | 4 ++--
dockerfiles/ubuntu-16.04-erlang-default | 4 ++--
12 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ff7e9389/dockerfiles/centos-6-erlang-18.3
----------------------------------------------------------------------
diff --git a/dockerfiles/centos-6-erlang-18.3 b/dockerfiles/centos-6-erlang-18.3
index 2164a69..bf67102 100644
--- a/dockerfiles/centos-6-erlang-18.3
+++ b/dockerfiles/centos-6-erlang-18.3
@@ -29,6 +29,6 @@ RUN ansible-playbook centos-6-erlang-18.3.yml \
--connection=local \
--inventory-file=./inventory/couchdb-ci-worker
-USER couchdb
+USER build
-CMD ["/home/couchdb/build-ci.sh"]
+CMD ["/home/build/build-ci.sh"]
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ff7e9389/dockerfiles/centos-6-erlang-default
----------------------------------------------------------------------
diff --git a/dockerfiles/centos-6-erlang-default b/dockerfiles/centos-6-erlang-default
index e85df9c..0c62c61 100644
--- a/dockerfiles/centos-6-erlang-default
+++ b/dockerfiles/centos-6-erlang-default
@@ -29,6 +29,6 @@ RUN ansible-playbook centos-6-erlang-default.yml \
--connection=local \
--inventory-file=./inventory/couchdb-ci-worker
-USER couchdb
+USER build
-CMD ["/home/couchdb/build-ci.sh"]
+CMD ["/home/build/build-ci.sh"]
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ff7e9389/dockerfiles/centos-7-erlang-18.3
----------------------------------------------------------------------
diff --git a/dockerfiles/centos-7-erlang-18.3 b/dockerfiles/centos-7-erlang-18.3
index e44ae50..f85c5d3 100644
--- a/dockerfiles/centos-7-erlang-18.3
+++ b/dockerfiles/centos-7-erlang-18.3
@@ -29,6 +29,6 @@ RUN ansible-playbook centos-7-erlang-18.3.yml \
--connection=local \
--inventory-file=./inventory/couchdb-ci-worker
-USER couchdb
+USER build
-CMD ["/home/couchdb/build-ci.sh"]
+CMD ["/home/build/build-ci.sh"]
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ff7e9389/dockerfiles/centos-7-erlang-default
----------------------------------------------------------------------
diff --git a/dockerfiles/centos-7-erlang-default b/dockerfiles/centos-7-erlang-default
index 9c0dd48..351275d 100644
--- a/dockerfiles/centos-7-erlang-default
+++ b/dockerfiles/centos-7-erlang-default
@@ -29,6 +29,6 @@ RUN ansible-playbook centos-7-erlang-default.yml \
--connection=local \
--inventory-file=./inventory/couchdb-ci-worker
-USER couchdb
+USER build
-CMD ["/home/couchdb/build-ci.sh"]
+CMD ["/home/build/build-ci.sh"]
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ff7e9389/dockerfiles/debian-8-erlang-18.3
----------------------------------------------------------------------
diff --git a/dockerfiles/debian-8-erlang-18.3 b/dockerfiles/debian-8-erlang-18.3
index e7f0b80..2c7e8aa 100644
--- a/dockerfiles/debian-8-erlang-18.3
+++ b/dockerfiles/debian-8-erlang-18.3
@@ -29,6 +29,6 @@ RUN ansible-playbook debian-8-erlang-18.3.yml \
--connection=local \
--inventory-file=./inventory/couchdb-ci-worker
-USER couchdb
+USER build
-CMD ["/home/couchdb/build-ci.sh"]
+CMD ["/home/build/build-ci.sh"]
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ff7e9389/dockerfiles/debian-8-erlang-default
----------------------------------------------------------------------
diff --git a/dockerfiles/debian-8-erlang-default b/dockerfiles/debian-8-erlang-default
index 5e23ac0..4d4ef4c 100644
--- a/dockerfiles/debian-8-erlang-default
+++ b/dockerfiles/debian-8-erlang-default
@@ -29,6 +29,6 @@ RUN ansible-playbook debian-8-erlang-default.yml \
--connection=local \
--inventory-file=./inventory/couchdb-ci-worker
-USER couchdb
+USER build
-CMD ["/home/couchdb/build-ci.sh"]
+CMD ["/home/build/build-ci.sh"]
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ff7e9389/dockerfiles/ubuntu-12.04-erlang-18.3
----------------------------------------------------------------------
diff --git a/dockerfiles/ubuntu-12.04-erlang-18.3 b/dockerfiles/ubuntu-12.04-erlang-18.3
index b5681e8..e7ccc35 100644
--- a/dockerfiles/ubuntu-12.04-erlang-18.3
+++ b/dockerfiles/ubuntu-12.04-erlang-18.3
@@ -29,6 +29,6 @@ RUN ansible-playbook ubuntu-12.04-erlang-18.3.yml \
--connection=local \
--inventory-file=./inventory/couchdb-ci-worker
-USER couchdb
+USER build
-CMD ["/home/couchdb/build-ci.sh"]
+CMD ["/home/build/build-ci.sh"]
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ff7e9389/dockerfiles/ubuntu-12.04-erlang-default
----------------------------------------------------------------------
diff --git a/dockerfiles/ubuntu-12.04-erlang-default b/dockerfiles/ubuntu-12.04-erlang-default
index 25e3e0e..7107075 100644
--- a/dockerfiles/ubuntu-12.04-erlang-default
+++ b/dockerfiles/ubuntu-12.04-erlang-default
@@ -29,6 +29,6 @@ RUN ansible-playbook ubuntu-12.04-erlang-default.yml \
--connection=local \
--inventory-file=./inventory/couchdb-ci-worker
-USER couchdb
+USER build
-CMD ["/home/couchdb/build-ci.sh"]
+CMD ["/home/build/build-ci.sh"]
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ff7e9389/dockerfiles/ubuntu-14.04-erlang-18.3
----------------------------------------------------------------------
diff --git a/dockerfiles/ubuntu-14.04-erlang-18.3 b/dockerfiles/ubuntu-14.04-erlang-18.3
index 7ff2348..1573a7f 100644
--- a/dockerfiles/ubuntu-14.04-erlang-18.3
+++ b/dockerfiles/ubuntu-14.04-erlang-18.3
@@ -29,6 +29,6 @@ RUN ansible-playbook ubuntu-14.04-erlang-18.3.yml \
--connection=local \
--inventory-file=./inventory/couchdb-ci-worker
-USER couchdb
+USER build
-CMD ["/home/couchdb/build-ci.sh"]
+CMD ["/home/build/build-ci.sh"]
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ff7e9389/dockerfiles/ubuntu-14.04-erlang-default
----------------------------------------------------------------------
diff --git a/dockerfiles/ubuntu-14.04-erlang-default b/dockerfiles/ubuntu-14.04-erlang-default
index 230b7d5..bbb2d80 100644
--- a/dockerfiles/ubuntu-14.04-erlang-default
+++ b/dockerfiles/ubuntu-14.04-erlang-default
@@ -29,6 +29,6 @@ RUN ansible-playbook ubuntu-14.04-erlang-default.yml \
--connection=local \
--inventory-file=./inventory/couchdb-ci-worker
-USER couchdb
+USER build
-CMD ["/home/couchdb/build-ci.sh"]
+CMD ["/home/build/build-ci.sh"]
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ff7e9389/dockerfiles/ubuntu-16.04-erlang-18.3
----------------------------------------------------------------------
diff --git a/dockerfiles/ubuntu-16.04-erlang-18.3 b/dockerfiles/ubuntu-16.04-erlang-18.3
index dbedf62..3c98421 100644
--- a/dockerfiles/ubuntu-16.04-erlang-18.3
+++ b/dockerfiles/ubuntu-16.04-erlang-18.3
@@ -29,6 +29,6 @@ RUN ansible-playbook ubuntu-16.04-erlang-18.3.yml \
--connection=local \
--inventory-file=./inventory/couchdb-ci-worker
-USER couchdb
+USER build
-CMD ["/home/couchdb/build-ci.sh"]
+CMD ["/home/build/build-ci.sh"]
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ff7e9389/dockerfiles/ubuntu-16.04-erlang-default
----------------------------------------------------------------------
diff --git a/dockerfiles/ubuntu-16.04-erlang-default b/dockerfiles/ubuntu-16.04-erlang-default
index ad846c3..bdf8472 100644
--- a/dockerfiles/ubuntu-16.04-erlang-default
+++ b/dockerfiles/ubuntu-16.04-erlang-default
@@ -29,6 +29,6 @@ RUN ansible-playbook ubuntu-16.04-erlang-default.yml \
--connection=local \
--inventory-file=./inventory/couchdb-ci-worker
-USER couchdb
+USER build
-CMD ["/home/couchdb/build-ci.sh"]
+CMD ["/home/build/build-ci.sh"]
[5/5] couchdb-ci git commit: add debian/ubuntu packaging tooling
Posted by wo...@apache.org.
add debian/ubuntu packaging tooling
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/67d84506
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/67d84506
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/67d84506
Branch: refs/heads/master
Commit: 67d84506e236b456ac81b1c1bb4e9ec2284bab8c
Parents: ae186b0
Author: Joan Touzet <wo...@apache.org>
Authored: Wed Apr 26 23:51:15 2017 -0700
Committer: Joan Touzet <wo...@apache.org>
Committed: Wed Apr 26 23:51:15 2017 -0700
----------------------------------------------------------------------
ansible/debian-8-base.yml | 1 +
.../roles/dependencies-debian/tasks/main.yml | 38 ++++++++++++++++----
.../roles/erlang-esl-debian-pkgs/vars/main.yml | 3 +-
ansible/roles/lintian-debian/files/main.profile | 3 ++
ansible/roles/lintian-debian/meta/main.yml | 3 ++
ansible/roles/lintian-debian/tasks/main.yml | 28 +++++++++++++++
6 files changed, 68 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/67d84506/ansible/debian-8-base.yml
----------------------------------------------------------------------
diff --git a/ansible/debian-8-base.yml b/ansible/debian-8-base.yml
index 02c624a..d99f45e 100644
--- a/ansible/debian-8-base.yml
+++ b/ansible/debian-8-base.yml
@@ -21,4 +21,5 @@
- debian-8
- { role: nodesource.node, nodejs_version: '6.x' }
- dependencies-debian
+ - lintian-debian
- common
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/67d84506/ansible/roles/dependencies-debian/tasks/main.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/dependencies-debian/tasks/main.yml b/ansible/roles/dependencies-debian/tasks/main.yml
index ad75ffc..aef6cbd 100644
--- a/ansible/roles/dependencies-debian/tasks/main.yml
+++ b/ansible/roles/dependencies-debian/tasks/main.yml
@@ -39,19 +39,43 @@
- libcurl4-openssl-dev
- libicu-dev
- libmozjs185-dev
-
-# required for make check and make dialyze
-- name: install packages required to build CouchDB
- apt: name={{item}} state=present install_recommends=no
- with_items:
- shunit2
# required for make docs
-- name: install packages required to build CouchDB
+- name: install packages required to build CouchDB docs
apt: name={{item}} state=present install_recommends=no
with_items:
- help2man
+ - python-sphinx
-# also required for make docs
+# Fix broken sphinx on ubuntu 12.04 only
+# Hack, but prevents needing a unique debian/ dir for this dist
- name: install up to date version of sphinx via pip
shell: pip install sphinx==1.5.3
+ when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "12.04"
+
+# dependencies for Debian/Ubuntu package building
+- name: install packages required to build Debian pkgs
+ apt: name={{item}} state=present install_recommends=no
+ with_items:
+ - curl
+ - debhelper
+ - dh-exec
+ - devscripts
+ - dialog
+ - lintian
+ - libwww-perl
+ - devscripts
+ - quilt
+
+# Hooray deMorgan's theorem
+- name: install dh-systemd package, if available
+ apt: name=dh-systemd state=present install_recommends=no
+ when: ansible_distribution != "Ubuntu" or ansible_distribution_version != "12.04"
+
+# convenience packages for interactive work
+- name: install convenience packages
+ apt: name={{item}} state=present install_recommends=no
+ with_items:
+ - vim-tiny
+ - screen
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/67d84506/ansible/roles/erlang-esl-debian-pkgs/vars/main.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/erlang-esl-debian-pkgs/vars/main.yml b/ansible/roles/erlang-esl-debian-pkgs/vars/main.yml
index 00ec403..c28a09a 100644
--- a/ansible/roles/erlang-esl-debian-pkgs/vars/main.yml
+++ b/ansible/roles/erlang-esl-debian-pkgs/vars/main.yml
@@ -29,4 +29,5 @@ erlang_solutions_pkg_list:
- erlang-xmerl
- erlang-eunit
- erlang-dialyzer
-
+ - erlang-reltool
+ - erlang-wx
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/67d84506/ansible/roles/lintian-debian/files/main.profile
----------------------------------------------------------------------
diff --git a/ansible/roles/lintian-debian/files/main.profile b/ansible/roles/lintian-debian/files/main.profile
new file mode 100644
index 0000000..e34f4e8
--- /dev/null
+++ b/ansible/roles/lintian-debian/files/main.profile
@@ -0,0 +1,3 @@
+Profile: couchdb/main
+Extends: debian/main
+Disable-Tags: dir-or-file-in-opt, source-is-missing, non-etc-file-marked-as-conffile
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/67d84506/ansible/roles/lintian-debian/meta/main.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/lintian-debian/meta/main.yml b/ansible/roles/lintian-debian/meta/main.yml
new file mode 100644
index 0000000..6b4fff8
--- /dev/null
+++ b/ansible/roles/lintian-debian/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+ - { role: common }
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/67d84506/ansible/roles/lintian-debian/tasks/main.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/lintian-debian/tasks/main.yml b/ansible/roles/lintian-debian/tasks/main.yml
new file mode 100644
index 0000000..1686a46
--- /dev/null
+++ b/ansible/roles/lintian-debian/tasks/main.yml
@@ -0,0 +1,28 @@
+# Licensed 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
+#
+# 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.
+
+- name: make lintian vendor directory
+ file:
+ path: /home/build/.lintian/profiles/couchdb
+ state: directory
+ owner: build
+ group: build
+ mode: 0755
+ recurse: yes
+
+- name: copy lintian vendor profile
+ copy:
+ src: main.profile
+ dest: /home/build/.lintian/profiles/couchdb/main.profile
+ owner: build
+ group: build
+ mode: 0644
[4/5] couchdb-ci git commit: Fix repo URL and build process
Posted by wo...@apache.org.
Fix repo URL and build process
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/ae186b0a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/ae186b0a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/ae186b0a
Branch: refs/heads/master
Commit: ae186b0af8ee5e372e7b99703d8eb451ca92b2fe
Parents: ff7e938
Author: Joan Touzet <wo...@apache.org>
Authored: Wed Apr 26 21:55:00 2017 -0700
Committer: Joan Touzet <wo...@apache.org>
Committed: Wed Apr 26 21:55:00 2017 -0700
----------------------------------------------------------------------
ansible/roles/common/files/build-ci.sh | 2 +-
ansible/roles/common/tasks/couchdb.yml | 2 +-
utils/analyze-jenkins-logs/ci-errors.markdown | 2 +-
utils/analyze-jenkins-logs/index.js | 2 +-
utils/analyze-jenkins-logs/package.json | 2 +-
utils/auto-download-jenkins-logs/package.json | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ae186b0a/ansible/roles/common/files/build-ci.sh
----------------------------------------------------------------------
diff --git a/ansible/roles/common/files/build-ci.sh b/ansible/roles/common/files/build-ci.sh
index e54960b..73b2b7d 100755
--- a/ansible/roles/common/files/build-ci.sh
+++ b/ansible/roles/common/files/build-ci.sh
@@ -22,7 +22,7 @@ set -e
# create a distribution tarball from the requested git branch
cd /usr/src/couchdb-checkout
git reset --hard
-git clean -fdx
+git clean -ffdx
git pull
git checkout $GIT_BRANCH
./configure --with-curl
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ae186b0a/ansible/roles/common/tasks/couchdb.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/common/tasks/couchdb.yml b/ansible/roles/common/tasks/couchdb.yml
index 5e44b5d..bf2bacf 100644
--- a/ansible/roles/common/tasks/couchdb.yml
+++ b/ansible/roles/common/tasks/couchdb.yml
@@ -35,7 +35,7 @@
- name: get CouchDB sources from git
git:
- repo: https://gitbox.apache.org/repos/asf/couchdb.git
+ repo: https://github.com/apache/couchdb.git
dest: /usr/src/couchdb-checkout
accept_hostkey: yes
force: yes
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ae186b0a/utils/analyze-jenkins-logs/ci-errors.markdown
----------------------------------------------------------------------
diff --git a/utils/analyze-jenkins-logs/ci-errors.markdown b/utils/analyze-jenkins-logs/ci-errors.markdown
index dc414e4..5435c2f 100644
--- a/utils/analyze-jenkins-logs/ci-errors.markdown
+++ b/utils/analyze-jenkins-logs/ci-errors.markdown
@@ -92,7 +92,7 @@ Links to the build logs:
## Regular Expressions
When one of these regular expression has a match in the build log, I assume this build failure falls into this category.
-* `/fatal: unable to access 'https:\/\/gitbox.apache.org/`
+* `/fatal: unable to access 'https:\/\/github.com/`
* `/fatal: read error: Connection reset by peer/`
## Builds
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ae186b0a/utils/analyze-jenkins-logs/index.js
----------------------------------------------------------------------
diff --git a/utils/analyze-jenkins-logs/index.js b/utils/analyze-jenkins-logs/index.js
index 1b49d7c..e0a837f 100644
--- a/utils/analyze-jenkins-logs/index.js
+++ b/utils/analyze-jenkins-logs/index.js
@@ -36,7 +36,7 @@ const reasons = {};
const regexes = {
aborted: [ /Build was aborted/ ],
network: [
- /fatal: unable to access 'https:\/\/gitbox.apache.org/,
+ /fatal: unable to access 'https:\/\/github.com/,
/fatal: read error: Connection reset by peer/,
],
docker: [
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ae186b0a/utils/analyze-jenkins-logs/package.json
----------------------------------------------------------------------
diff --git a/utils/analyze-jenkins-logs/package.json b/utils/analyze-jenkins-logs/package.json
index c706ba6..840f716 100644
--- a/utils/analyze-jenkins-logs/package.json
+++ b/utils/analyze-jenkins-logs/package.json
@@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
- "url": "https://gitbox.apache.org/repos/asf/couchdb.git"
+ "url": "https://github.com/apache/couchdb.git"
},
"author": "The Apache CouchDB contributors",
"license": "Apache-2.0",
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/ae186b0a/utils/auto-download-jenkins-logs/package.json
----------------------------------------------------------------------
diff --git a/utils/auto-download-jenkins-logs/package.json b/utils/auto-download-jenkins-logs/package.json
index 5d782e8..44105bd 100644
--- a/utils/auto-download-jenkins-logs/package.json
+++ b/utils/auto-download-jenkins-logs/package.json
@@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
- "url": "https://gitbox.apache.org/repos/asf/couchdb.git"
+ "url": "https://github.com/apache/couchdb.git"
},
"author": "The Apache CouchDB contributors",
"license": "Apache-2.0",