X-Git-Url: https://git.arvados.org/arvados-dev.git/blobdiff_plain/4044a6363ba1ccebc98369dfa70052961fcf1117..refs/heads/6388-package-scripts-redhat-support-wip:/jenkins/run-build-packages.sh diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh index d76fa07..0eb2244 100755 --- 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 && rm -f *deb' + REPO_UPDATE_CMD='freight add *deb apt/wheezy && freight cache && rsync -AaHX /var/www/freight/ /var/www/freight-production/ --delete && rm -f *deb' PYTHON2_PACKAGE=python$PYTHON2_VERSION PYTHON2_PKG_PREFIX=python @@ -105,13 +105,13 @@ case "$TARGET" in 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) + ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse) PYTHON3_BACKPORTS=(docker-py six requests) ;; ubuntu1204) FORMAT=deb FPM_OUTDIR=tmp - REPO_UPDATE_CMD='freight add *deb apt/precise && freight cache && rm -f *deb' + REPO_UPDATE_CMD='freight add *deb apt/precise && freight cache && rsync -AaHX /var/www/freight/ /var/www/freight-production/ --delete && rm -f *deb' PYTHON2_PACKAGE=python$PYTHON2_VERSION PYTHON2_PKG_PREFIX=python @@ -121,7 +121,7 @@ case "$TARGET" in 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) + ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse) PYTHON3_BACKPORTS=(docker-py six requests) ;; centos6) @@ -237,7 +237,7 @@ handle_python_package () { fi } -# Build debs for everything +# Build packages for everything fpm_build_and_scp () { # The package source. Depending on the source type, this can be a # path, or the name of the package in an upstream repository (e.g., @@ -316,7 +316,7 @@ fpm_build_and_scp () { fpm_verify_and_scp $FPM_EXIT_CODE $FPM_RESULTS } -# verify build results and scp debs, if needed +# verify build results and scp packages, if needed fpm_verify_and_scp () { FPM_EXIT_CODE=$1 shift