[ARVADOS-DEV] updated: cc2a6672fef9bb825b2fa4b8482f4306cae491a1

[git at public.curoverse.com]

Summary of changes:
 jenkins/dockerfiles/Makefile                              |  6 +++++-
 jenkins/dockerfiles/{ubuntu1204 => ubuntu1404}/Dockerfile |  6 +++---
 jenkins/run-build-packages.sh                             | 11 +++++++++++
 jenkins/run_upload_packages.py                            |  3 ++-
 4 files changed, 21 insertions(+), 5 deletions(-)
 copy jenkins/dockerfiles/{ubuntu1204 => ubuntu1404}/Dockerfile (85%)

       via  cc2a6672fef9bb825b2fa4b8482f4306cae491a1 (commit)
       via  ae548f25303fad421a20ebcc34af39a6d0ee0db8 (commit)
      from  310db12be5e8825d11e91a0abc30b63548ec4757 (commit)

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 cc2a6672fef9bb825b2fa4b8482f4306cae491a1
Merge: 310db12 ae548f2
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Jul 27 08:55:43 2015 -0400

    Merge branch '6691-trusty-packages-wip'
    
    Refs #6691.  Closes #6742.


commit ae548f25303fad421a20ebcc34af39a6d0ee0db8
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Jul 23 17:10:54 2015 -0400

    6691: Build and ship packages for Ubuntu 14.04.

diff --git a/jenkins/dockerfiles/Makefile b/jenkins/dockerfiles/Makefile
index 3d6eec6..70fbf28 100644
--- a/jenkins/dockerfiles/Makefile
+++ b/jenkins/dockerfiles/Makefile
@@ -1,4 +1,4 @@
-all: centos6/generated debian7/generated debian8/generated ubuntu1204/generated
+all: centos6/generated debian7/generated debian8/generated ubuntu1204/generated ubuntu1404/generated
 
 centos6/generated: common-generated-all
 	test -d centos6/generated || mkdir centos6/generated
@@ -16,6 +16,10 @@ ubuntu1204/generated: common-generated-all
 	test -d ubuntu1204/generated || mkdir ubuntu1204/generated
 	cp -rlt ubuntu1204/generated common-generated/*
 
+ubuntu1404/generated: common-generated-all
+	test -d ubuntu1404/generated || mkdir ubuntu1404/generated
+	cp -rlt ubuntu1404/generated common-generated/*
+
 common-generated-all: common-generated/golang-amd64.tar.gz
 
 common-generated/golang-amd64.tar.gz: common-generated
diff --git a/jenkins/dockerfiles/ubuntu1404/Dockerfile b/jenkins/dockerfiles/ubuntu1404/Dockerfile
new file mode 100644
index 0000000..4b56bce
--- /dev/null
+++ b/jenkins/dockerfiles/ubuntu1404/Dockerfile
@@ -0,0 +1,19 @@
+FROM ubuntu:trusty
+MAINTAINER Brett Smith <brett 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 curl git libattr1-dev libfuse-dev
+
+# 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.1 && \
+    /usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
+    /usr/local/rvm/bin/rvm-exec default gem install fpm
+
+# Install golang binary
+ADD generated/golang-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", "ubuntu1404"]
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index b8e58d7..4150a2b 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -104,6 +104,17 @@ case "$TARGET" in
             ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse)
         PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
         ;;
+    ubuntu1404)
+        FORMAT=deb
+        PYTHON2_PACKAGE=python$PYTHON2_VERSION
+        PYTHON2_PKG_PREFIX=python
+        PYTHON3_PACKAGE=python$PYTHON3_VERSION
+        PYTHON3_PKG_PREFIX=python3
+        PYTHON_BACKPORTS=(pyasn1==0.1.7 pyasn1-modules==0.0.5 llfuse ciso8601 \
+            google-api-python-client six uritemplate oauth2client httplib2 \
+            rsa apache-libcloud pycurl backports.ssl_match_hostname)
+        PYTHON3_BACKPORTS=(docker-py requests websocket-client)
+        ;;
     centos6)
         FORMAT=rpm
         PYTHON2_PACKAGE=$(rpm -qf "$(which python$PYTHON2_VERSION)" --queryformat '%{NAME}\n')
diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py
index fb4defd..b0a9706 100755
--- a/jenkins/run_upload_packages.py
+++ b/jenkins/run_upload_packages.py
@@ -153,6 +153,7 @@ rm "$@"
         'debian7': 'wheezy',
         'debian8': 'jessie',
         'ubuntu1204': 'precise',
+        'ubuntu1404': 'trusty',
         }
 
     def post_uploads(self, paths):
@@ -191,7 +192,7 @@ PACKAGE_SUITES = {
                             'services/nodemanager/dist/*.tar.gz'),
     'gems': _define_suite(GemPackageSuite, 'sdk/ruby/*.gem', 'sdk/cli/*.gem'),
     }
-for target in ['debian7', 'debian8', 'ubuntu1204']:
+for target in ['debian7', 'debian8', 'ubuntu1204', 'ubuntu1404']:
     PACKAGE_SUITES[target] = _define_suite(
         DebianPackageSuite, os.path.join('packages', target, '*.deb'),
         target=target)

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


hooks/post-receive
--