Make sure jessie packages end up in the jessie repository.

[arvados-dev.git] / jenkins / run-build-packages.sh

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index f2ce33a66e838fab483f0dbce5104fe59c77d496..8bf153c923374777b7819e182ec83c691fb1df82 100755 (executable)
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -95,7 +95,7 @@ case "$TARGET" in
     debian7)
         FORMAT=deb
         FPM_OUTDIR=tmp
-        REPO_UPDATE_CMD='freight add *deb apt/wheezy && freight cache && rsync -AaHX /var/www/freight/ /var/www/freight-production/ --delete && rm -f *deb'
+        REPO_UPDATE_CMD='freight add *deb apt/wheezy && freight cache && rm -f *deb'
 
         PYTHON2_PACKAGE=python$PYTHON2_VERSION
         PYTHON2_PKG_PREFIX=python
@@ -106,12 +106,28 @@ case "$TARGET" in
             rsa uritemplate httplib2 ws4py \
             virtualenv pykka apache-libcloud requests six pyexecjs jsonschema \
             ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse)
-        PYTHON3_BACKPORTS=(docker-py six requests)
+        PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
+        ;;
+    debian8)
+        FORMAT=deb
+        FPM_OUTDIR=tmp
+        REPO_UPDATE_CMD='freight add *deb apt/jessie && freight cache && rm -f *deb'
+
+        PYTHON2_PACKAGE=python$PYTHON2_VERSION
+        PYTHON2_PKG_PREFIX=python
+        PYTHON3_PACKAGE=python$PYTHON3_VERSION
+        PYTHON3_PKG_PREFIX=python3
+        PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
+            oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
+            rsa uritemplate httplib2 ws4py \
+            virtualenv pykka apache-libcloud requests six pyexecjs jsonschema \
+            ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse)
+        PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
         ;;
     ubuntu1204)
         FORMAT=deb
         FPM_OUTDIR=tmp
-        REPO_UPDATE_CMD='freight add *deb apt/precise && freight cache && rsync -AaHX /var/www/freight/ /var/www/freight-production/ --delete && rm -f *deb'
+        REPO_UPDATE_CMD='freight add *deb apt/precise && freight cache && rm -f *deb'
 
         PYTHON2_PACKAGE=python$PYTHON2_VERSION
         PYTHON2_PKG_PREFIX=python
@@ -122,7 +138,7 @@ case "$TARGET" in
             rsa uritemplate httplib2 ws4py \
             virtualenv pykka apache-libcloud requests six pyexecjs jsonschema \
             ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse)
-        PYTHON3_BACKPORTS=(docker-py six requests)
+        PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
         ;;
     centos6)
         FORMAT=rpm
@@ -730,8 +746,9 @@ fi
 # from the package - empty it instead.
 rm -rf $WORKSPACE/apps/workbench/tmp/*
 
-# Set up application.yml so that asset precompilation works
+# Set up application.yml and production.rb so that asset precompilation works
 \cp config/application.yml.example config/application.yml -f
+\cp config/environments/production.rb.example config/environments/production.rb -f
 sed -i 's/secret_token: ~/secret_token: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/' config/application.yml
 
 RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake assets:precompile >/dev/null