[ARVADOS] created: c1a46a8a2d151c394cedb49a457926576ec59600

Git user git at public.curoverse.com
Thu Jan 26 17:33:30 EST 2017 

        at  c1a46a8a2d151c394cedb49a457926576ec59600 (commit)


commit c1a46a8a2d151c394cedb49a457926576ec59600
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Jan 26 17:33:05 2017 -0500

    Document our Ubuntu 16.04 support.
    
    refs #10988

diff --git a/doc/install/install-manual-prerequisites.html.textile.liquid b/doc/install/install-manual-prerequisites.html.textile.liquid
index 97a346b..482cffe 100644
--- a/doc/install/install-manual-prerequisites.html.textile.liquid
+++ b/doc/install/install-manual-prerequisites.html.textile.liquid
@@ -29,6 +29,7 @@ table(table table-bordered table-condensed).
 |Debian 8 ("jessie")|Supported|Latest|
 |Ubuntu 12.04 ("precise")|Supported|Latest|
 |Ubuntu 14.04 ("trusty")|Supported|Latest|
+|Ubuntu 16.04 ("xenial")|Supported|Latest|
 |Debian 7 ("wheezy")|EOL|997479d1408139e96ecdb42a60b4f727f814f6c9 (2016-12-28)|
 |CentOS 6 |EOL|997479d1408139e96ecdb42a60b4f727f814f6c9 (2016-12-28)|
 
@@ -53,7 +54,7 @@ baseurl=http://rpm.arvados.org/CentOS/$releasever/os/$basearch/
 
 h3. Debian and Ubuntu
 
-Packages are available for Debian 8 ("jessie"), Ubuntu 12.04 ("precise"), and Ubuntu 14.04 ("trusty").
+Packages are available for Debian 8 ("jessie"), Ubuntu 12.04 ("precise"), Ubuntu 14.04 ("trusty") and Ubuntu 16.04 ("xenial").
 
 First, register the Curoverse signing key in apt's database:
 
@@ -64,12 +65,23 @@ Configure apt to retrieve packages from the Arvados package repository. This com
 table(table table-bordered table-condensed).
 |OS version|Command|
 |Debian 8 ("jessie")|<notextile><code><span class="userinput">echo "deb http://apt.arvados.org/ jessie main" &#x7c; sudo tee /etc/apt/sources.list.d/arvados.list</span></code></notextile>|
-|Ubuntu 12.04 ("precise")|<notextile><code><span class="userinput">echo "deb http://apt.arvados.org/ precise main" &#x7c; sudo tee /etc/apt/sources.list.d/arvados.list</span></code></notextile>|
-|Ubuntu 14.04 ("trusty")|<notextile><code><span class="userinput">echo "deb http://apt.arvados.org/ trusty main" &#x7c; sudo tee /etc/apt/sources.list.d/arvados.list</span></code></notextile>|
+|Ubuntu 12.04 ("precise")[1]|<notextile><code><span class="userinput">echo "deb http://apt.arvados.org/ precise main" &#x7c; sudo tee /etc/apt/sources.list.d/arvados.list</span></code></notextile>|
+|Ubuntu 14.04 ("trusty")[1]|<notextile><code><span class="userinput">echo "deb http://apt.arvados.org/ trusty main" &#x7c; sudo tee /etc/apt/sources.list.d/arvados.list</span></code></notextile>|
+|Ubuntu 16.04 ("xenial")[1] [2]|<notextile><code><span class="userinput">echo "deb http://apt.arvados.org/ xenial main" &#x7c; sudo tee /etc/apt/sources.list.d/arvados.list</span></code></notextile>|
 
 {% include 'notebox_begin' %}
 
-Arvados packages for Ubuntu may depend on third-party packages in Ubuntu's "universe" repository.  If you're installing on Ubuntu, make sure you have the universe sources uncommented in @/etc/apt/sources.list at .
+fn1. Arvados packages for Ubuntu may depend on third-party packages in Ubuntu's "universe" repository.  If you're installing on Ubuntu, make sure you have the universe sources uncommented in @/etc/apt/sources.list at .
+
+fn2. If you use Ubuntu 16.04 ("xenial"), you need to create @/etc/apt/preferences.d/arvados@ with these contents:
+
+<pre>
+Package: *
+Pin: origin "apt.arvados.org"
+Pin-Priority: 501
+</pre>
+
+This gives packages from apt.arvados.org a slight priority over the default Ubuntu 16.04 ("xenial") packages, so that dependencies on older versions of certain packages get installed automatically. Specificaly, this affects the python-pycurl and python-oauth2client packages provided in the Arvados apt repositories.
 
 {% include 'notebox_end' %}
 

commit 8675eec8206c0e39753741864636c8a05ce02408
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Jan 26 17:30:58 2017 -0500

    Add support for Ubuntu 1604 ("xenial") to our build scripts.
    
    refs #10980

diff --git a/build/build.list b/build/build.list
index 554bde4..9e6317a 100644
--- a/build/build.list
+++ b/build/build.list
@@ -1,33 +1,33 @@
 #distribution(s)|name|version|iteration|type|architecture|extra fpm arguments
 debian8,ubuntu1204,centos7|python-gflags|2.0|2|python|all
-debian8,ubuntu1204,ubuntu1404,centos7|google-api-python-client|1.4.2|2|python|all
-debian8,ubuntu1204,ubuntu1404,centos7|oauth2client|1.5.2|2|python|all
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|google-api-python-client|1.4.2|2|python|all
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|oauth2client|1.5.2|2|python|all
 debian8,ubuntu1204,ubuntu1404,centos7|pyasn1|0.1.7|2|python|all
 debian8,ubuntu1204,ubuntu1404,centos7|pyasn1-modules|0.0.5|2|python|all
-debian8,ubuntu1204,ubuntu1404,centos7|rsa|3.4.2|2|python|all
-debian8,ubuntu1204,ubuntu1404,centos7|uritemplate|3.0.0|2|python|all
-debian8,ubuntu1204,ubuntu1404,centos7|httplib2|0.9.2|3|python|all
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|rsa|3.4.2|2|python|all
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|uritemplate|3.0.0|2|python|all
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|httplib2|0.9.2|3|python|all
 debian8,ubuntu1204,centos7|ws4py|0.3.5|2|python|all
 debian8,ubuntu1204,centos7|pykka|1.2.1|2|python|all
 debian8,ubuntu1204,ubuntu1404|six|1.10.0|2|python|all
-debian8,ubuntu1204,ubuntu1404,centos7|ciso8601|1.0.3|3|python|amd64
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|ciso8601|1.0.3|3|python|amd64
 debian8,ubuntu1204,centos7|pycrypto|2.6.1|3|python|amd64
-debian8,ubuntu1204,ubuntu1404|backports.ssl_match_hostname|3.5.0.1|2|python|all
+debian8,ubuntu1204,ubuntu1404,ubuntu1604|backports.ssl_match_hostname|3.5.0.1|2|python|all
 debian8,ubuntu1204,ubuntu1404,centos7|llfuse|0.41.1|3|python|amd64
-debian8,ubuntu1204,ubuntu1404,centos7|pycurl|7.19.5.3|3|python|amd64
-debian8,ubuntu1204,ubuntu1404,centos7|pyyaml|3.12|2|python|amd64
-debian8,ubuntu1204,ubuntu1404,centos7|rdflib|4.2.1|2|python|all
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|pycurl|7.19.5.3|3|python|amd64
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|pyyaml|3.12|2|python|amd64
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|rdflib|4.2.1|2|python|all
 debian8,ubuntu1204,ubuntu1404,centos7|shellescape|3.4.1|2|python|all
-debian8,ubuntu1204,ubuntu1404,centos7|mistune|0.7.3|2|python|all
-debian8,ubuntu1204,ubuntu1404,centos7|typing|3.5.3.0|2|python|all
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|mistune|0.7.3|2|python|all
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|typing|3.5.3.0|2|python|all
 debian8,ubuntu1204,ubuntu1404,centos7|avro|1.8.1|2|python|all
 debian8,ubuntu1204,ubuntu1404,centos7|ruamel.ordereddict|0.4.9|2|python|amd64
-debian8,ubuntu1204,ubuntu1404,centos7|cachecontrol|0.11.7|2|python|all
-debian8,ubuntu1204,ubuntu1404,centos7|pathlib2|2.1.0|2|python|all
-debian8,ubuntu1204,ubuntu1404,centos7|docker-py|1.7.2|2|python3|all
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|cachecontrol|0.11.7|2|python|all
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|pathlib2|2.1.0|2|python|all
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|docker-py|1.7.2|2|python3|all
 debian8,ubuntu1204,centos7|six|1.10.0|2|python3|all
 debian8,ubuntu1204,ubuntu1404,centos7|requests|2.12.4|2|python3|all
-debian8,ubuntu1204,ubuntu1404,centos7|websocket-client|0.37.0|2|python3|all
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|websocket-client|0.37.0|2|python3|all
 ubuntu1204|requests|2.12.4|2|python|all
 ubuntu1204,centos7|contextlib2|0.5.4|2|python|all
 ubuntu1204,centos7|isodate|0.5.4|2|python|all
@@ -37,7 +37,7 @@ centos7|pyparsing|2.1.10|2|python|all
 centos7|sparqlwrapper|1.8.0|2|python|all
 centos7|html5lib|0.9999999|2|python|all
 centos7|keepalive|0.5|2|python|all
-all|lockfile|0.12.2|2|python|all|--epoch 1
+debian8,ubuntu1204,ubuntu1404,ubuntu1604,centos7|lockfile|0.12.2|2|python|all|--epoch 1
 all|ruamel.yaml|0.13.7|2|python|amd64|--python-setup-py-arguments --single-version-externally-managed
 all|cwltest|1.0.20160907111242|3|python|all|--depends 'python-futures >= 3.0.5'
 all|rdflib-jsonld|0.4.0|2|python|all
diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 9987e9e..5fae9dc 100644
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -1,4 +1,4 @@
-all: centos7/generated debian8/generated ubuntu1204/generated ubuntu1404/generated
+all: centos7/generated debian8/generated ubuntu1204/generated ubuntu1404/generated ubuntu1604/generated
 
 centos7/generated: common-generated-all
 	test -d centos7/generated || mkdir centos7/generated
@@ -16,6 +16,10 @@ ubuntu1404/generated: common-generated-all
 	test -d ubuntu1404/generated || mkdir ubuntu1404/generated
 	cp -rlt ubuntu1404/generated common-generated/*
 
+ubuntu1604/generated: common-generated-all
+	test -d ubuntu1604/generated || mkdir ubuntu1604/generated
+	cp -rlt ubuntu1604/generated common-generated/*
+
 GOTARBALL=go1.7.1.linux-amd64.tar.gz
 
 common-generated-all: common-generated/$(GOTARBALL)
diff --git a/build/package-build-dockerfiles/ubuntu1604/Dockerfile b/build/package-build-dockerfiles/ubuntu1604/Dockerfile
new file mode 100644
index 0000000..b3ac60f
--- /dev/null
+++ b/build/package-build-dockerfiles/ubuntu1604/Dockerfile
@@ -0,0 +1,20 @@
+FROM ubuntu:xenial
+MAINTAINER Ward Vandewege <ward at curoverse.com>
+
+# Install dependencies and set up system.
+RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev libgnutls-dev curl git libattr1-dev libfuse-dev libpq-dev python-pip unzip
+
+# Install RVM
+RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
+    curl -L https://get.rvm.io | bash -s stable && \
+    /usr/local/rvm/bin/rvm install 2.3.3 && \
+    /usr/local/rvm/bin/rvm alias create default ruby-2.3.3 && \
+    /usr/local/rvm/bin/rvm-exec default gem install bundler && \
+    /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
+
+# Install golang binary
+ADD generated/go1.7.1.linux-amd64.tar.gz /usr/local/
+RUN ln -s /usr/local/go/bin/go /usr/local/bin/
+
+ENV WORKSPACE /arvados
+CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "ubuntu1604"]
diff --git a/build/package-test-dockerfiles/ubuntu1604/Dockerfile b/build/package-test-dockerfiles/ubuntu1604/Dockerfile
new file mode 100644
index 0000000..87d19cd
--- /dev/null
+++ b/build/package-test-dockerfiles/ubuntu1604/Dockerfile
@@ -0,0 +1,20 @@
+FROM ubuntu:xenial
+MAINTAINER Ward Vandewege <ward at curoverse.com>
+
+# Install RVM
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends curl ca-certificates && \
+    gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
+    curl -L https://get.rvm.io | bash -s stable && \
+    /usr/local/rvm/bin/rvm install 2.3 && \
+    /usr/local/rvm/bin/rvm alias create default ruby-2.3
+
+# udev daemon can't start in a container, so don't try.
+RUN mkdir -p /etc/udev/disabled
+
+RUN echo "deb file:///arvados/packages/ubuntu1604/ /" >>/etc/apt/sources.list
+
+# Add preferences file for the Arvados packages. This pins Arvados
+# packages at priority 501, so that older python dependency versions
+# are preferred in those cases where we need them
+ADD etc-apt-preferences.d-arvados /etc/apt/preferences.d/arvados
diff --git a/build/package-test-dockerfiles/ubuntu1604/etc-apt-preferences.d-arvados b/build/package-test-dockerfiles/ubuntu1604/etc-apt-preferences.d-arvados
new file mode 100644
index 0000000..9e24695
--- /dev/null
+++ b/build/package-test-dockerfiles/ubuntu1604/etc-apt-preferences.d-arvados
@@ -0,0 +1,3 @@
+Package: *
+Pin: release o=Arvados
+Pin-Priority: 501
diff --git a/build/package-testing/test-packages-ubuntu1604.sh b/build/package-testing/test-packages-ubuntu1604.sh
new file mode 120000
index 0000000..54ce94c
--- /dev/null
+++ b/build/package-testing/test-packages-ubuntu1604.sh
@@ -0,0 +1 @@
+deb-common-test-packages.sh
\ No newline at end of file
diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index 6a1ec9c..685ca51 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -11,7 +11,7 @@ Syntax:
 --command
     Build command to execute (default: use built-in Docker image command)
 --test-packages
-    Run package install test script "test-packages-$target.sh"
+    Run package install test script "test-packages-[target].sh"
 --debug
     Output debug information (default: false)
 --only-build <package>
@@ -99,7 +99,8 @@ if [[ -n "$test_packages" ]]; then
 
     if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.deb')" ]] ; then
         (cd $WORKSPACE/packages/$TARGET
-         dpkg-scanpackages .  2> >(grep -v 'warning' 1>&2) | gzip -c > Packages.gz
+          dpkg-scanpackages .  2> >(grep -v 'warning' 1>&2) | tee Packages | gzip -c > Packages.gz
+          apt-ftparchive -o APT::FTPArchive::Release::Origin=Arvados release . > Release
         )
     fi
 
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 7840b3c..37e963b 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -112,6 +112,9 @@ case "$TARGET" in
     ubuntu1404)
         FORMAT=deb
         ;;
+    ubuntu1604)
+        FORMAT=deb
+        ;;
     centos7)
         FORMAT=rpm
         PYTHON2_PACKAGE=$(rpm -qf "$(which python$PYTHON2_VERSION)" --queryformat '%{NAME}\n')

commit 799b5333c66ccd18fe1b0ee97c2a28be6e07b731
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Jan 26 17:24:10 2017 -0500

    Remove old debian7 package testing file.
    
    refs #10785

diff --git a/build/package-testing/test-packages-debian7.sh b/build/package-testing/test-packages-debian7.sh
deleted file mode 120000
index 54ce94c..0000000
--- a/build/package-testing/test-packages-debian7.sh
+++ /dev/null
@@ -1 +0,0 @@
-deb-common-test-packages.sh
\ No newline at end of file

commit 9dd66f4d896785e0c6dce839ed1b411dd3c77bf0
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Jan 26 17:23:04 2017 -0500

    Remove deprecated --force-yes flag during package testing, replace with
    --allow-unauthorized
    
    refs #10980

diff --git a/build/package-testing/deb-common-test-packages.sh b/build/package-testing/deb-common-test-packages.sh
index 5f32a60..58fc57e 100755
--- a/build/package-testing/deb-common-test-packages.sh
+++ b/build/package-testing/deb-common-test-packages.sh
@@ -11,7 +11,7 @@ export ARV_PACKAGES_DIR="/arvados/packages/$target"
 dpkg-query --show > "$ARV_PACKAGES_DIR/$1.before"
 
 apt-get -qq update
-apt-get --assume-yes --force-yes install "$1"
+apt-get --assume-yes --allow-unauthenticated install "$1"
 
 dpkg-query --show > "$ARV_PACKAGES_DIR/$1.after"
 

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


hooks/post-receive
--

More information about the arvados-commits mailing list