[ARVADOS-DEV] updated: 0394c5179b470d2e433316b66f0c89e6be56b254

git at public.curoverse.com git at public.curoverse.com
Fri Oct 30 16:52:51 EDT 2015


Summary of changes:
 .../arvados-api-server-upgrade.sh                  |  9 ++++
 .../arvados-sso-server.postinst                    |  9 ++++
 .../arvados-workbench-upgrade.sh                   |  9 ++++
 jenkins/common-test-packages.sh                    | 28 ++++++++++
 jenkins/deb-common-test-packages.sh                | 27 ++++++++++
 jenkins/dockerfiles/centos6/Dockerfile             |  9 ++--
 jenkins/dockerfiles/debian7/Dockerfile             |  2 +-
 jenkins/dockerfiles/debian8/Dockerfile             |  2 +-
 jenkins/dockerfiles/ubuntu1204/Dockerfile          |  2 +-
 jenkins/dockerfiles/ubuntu1404/Dockerfile          |  2 +-
 .../package-test-dockerfiles/centos6/Dockerfile    |  9 ++++
 .../centos6/localrepo.repo                         |  5 ++
 .../package-test-dockerfiles/debian7/Dockerfile    |  4 ++
 .../package-test-dockerfiles/debian8/Dockerfile    |  4 ++
 .../package-test-dockerfiles/ubuntu1204/Dockerfile |  4 ++
 .../package-test-dockerfiles/ubuntu1404/Dockerfile |  4 ++
 jenkins/run-build-packages-all-targets.sh          | 42 ++++-----------
 jenkins/run-build-packages-one-target.sh           | 63 ++++++++++++++--------
 jenkins/run-build-packages.sh                      |  2 +-
 jenkins/run-tests.sh                               |  2 +-
 jenkins/test-packages-centos6.sh                   | 29 ++++++++++
 jenkins/test-packages-debian7.sh                   |  1 +
 jenkins/test-packages-debian8.sh                   |  1 +
 jenkins/test-packages-ubuntu1204.sh                |  1 +
 jenkins/test-packages-ubuntu1404.sh                |  1 +
 25 files changed, 208 insertions(+), 63 deletions(-)
 create mode 100755 jenkins/common-test-packages.sh
 create mode 100755 jenkins/deb-common-test-packages.sh
 create mode 100644 jenkins/package-test-dockerfiles/centos6/Dockerfile
 create mode 100644 jenkins/package-test-dockerfiles/centos6/localrepo.repo
 create mode 100644 jenkins/package-test-dockerfiles/debian7/Dockerfile
 create mode 100644 jenkins/package-test-dockerfiles/debian8/Dockerfile
 create mode 100644 jenkins/package-test-dockerfiles/ubuntu1204/Dockerfile
 create mode 100644 jenkins/package-test-dockerfiles/ubuntu1404/Dockerfile
 create mode 100755 jenkins/test-packages-centos6.sh
 create mode 120000 jenkins/test-packages-debian7.sh
 create mode 120000 jenkins/test-packages-debian8.sh
 create mode 120000 jenkins/test-packages-ubuntu1204.sh
 create mode 120000 jenkins/test-packages-ubuntu1404.sh

  discards  991b0e4576a71e160c1abc9ffabd80564ffe96f3 (commit)
  discards  1078cc899f99daf20e5184c0a3917f0848fd6c2e (commit)
       via  0394c5179b470d2e433316b66f0c89e6be56b254 (commit)
       via  5c6e3d761c5068be26ac1bd01445b969564231b1 (commit)
       via  e95c317d14fb037cdf7937b16dbdd577139787ec (commit)
       via  846f42e54e6f2e4b00802c5f1a45cb2ec1b23674 (commit)
       via  69e10b5d9116fed733b192ba902d2dc7ad68a076 (commit)
       via  cadd265aa66c1fd41e3a385a3b23e97462094b4b (commit)
       via  40fff998c296ff1fa3ae681a1ae4c06df7f6abe5 (commit)
       via  426e8062746c72854622a7a676c8f5c51fef45ff (commit)
       via  937bbde50c186d8d28bff1d8980fd701cb9b72ab (commit)
       via  d3c6950d8f2945c18448a0b1edf38bf8d15ced3f (commit)
       via  d8b5db8865d9d2929e9a3fe708d609d10622817f (commit)
       via  d119e26a14b0bc143638ca38926a4a0d911fe8f1 (commit)
       via  cffee40d749672091b0969c8ec3168ab3e5254d6 (commit)
       via  9eac45e52bf4a4b37bebfb2fc85ec5584207bfa8 (commit)
       via  a23620386db119bf670221368016484a5a2f1f93 (commit)
       via  ad5f9554d13754e16def528a24a2669f7cbd4e5d (commit)
       via  72c6e7bcd898caa3a2ed718e66b71568fe66bc7d (commit)
       via  d20e33394de2a85f17399e0e4d9d7d2e52c94178 (commit)
       via  39520ae3caa8227e58471b8783106a3c2dba1304 (commit)
       via  823a16ae78acdadd17d6f563dfafe4678c364906 (commit)
       via  21a3d01379891f2670991e4d24804e1dc87a1ab1 (commit)
       via  8713e250470011db40d0cc9f1a02afbf98d2853c (commit)
       via  77f198433d31d492d86c38359940acd7f5012cf8 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (991b0e4576a71e160c1abc9ffabd80564ffe96f3)
            \
             N -- N -- N (0394c5179b470d2e433316b66f0c89e6be56b254)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0394c5179b470d2e433316b66f0c89e6be56b254
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Oct 30 16:51:33 2015 -0400

    5824: Update log message.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 03486a3..1b1e757 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -253,7 +253,7 @@ start_api() {
 }
 
 start_nginx_proxy_services() {
-    echo 'Starting keepproxy, arv-git-httpd, and nginx ssl proxy...'
+    echo 'Starting keepproxy, keep-web, arv-git-httpd, and nginx ssl proxy...'
     cd "$WORKSPACE" \
         && python sdk/python/tests/run_test_server.py start_keep_proxy \
         && python sdk/python/tests/run_test_server.py start_keep-web \

commit 5c6e3d761c5068be26ac1bd01445b969564231b1
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Oct 17 03:02:03 2015 -0400

    5824: Start keep-web service for Workbench integration tests.

diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 8e845cb..03486a3 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -256,6 +256,7 @@ start_nginx_proxy_services() {
     echo 'Starting keepproxy, arv-git-httpd, and nginx ssl proxy...'
     cd "$WORKSPACE" \
         && python sdk/python/tests/run_test_server.py start_keep_proxy \
+        && python sdk/python/tests/run_test_server.py start_keep-web \
         && python sdk/python/tests/run_test_server.py start_arv-git-httpd \
         && python sdk/python/tests/run_test_server.py start_nginx \
         && export ARVADOS_TEST_PROXY_SERVICES=1
@@ -267,6 +268,7 @@ stop_services() {
         cd "$WORKSPACE" \
             && python sdk/python/tests/run_test_server.py stop_nginx \
             && python sdk/python/tests/run_test_server.py stop_arv-git-httpd \
+            && python sdk/python/tests/run_test_server.py stop_keep-web \
             && python sdk/python/tests/run_test_server.py stop_keep_proxy
     fi
     if [[ -n "$ARVADOS_TEST_API_HOST" ]]; then

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list