[ARVADOS] created: 1.3.0-1612-g39eb1f4e9
Git user
git at public.curoverse.com
Fri Sep 20 19:02:41 UTC 2019
at 39eb1f4e97873fe0dff6f4e7f0dc68f9cc97aada (commit)
commit 39eb1f4e97873fe0dff6f4e7f0dc68f9cc97aada
Author: Fernando Monserrat <fmonserrat at veritasgenetics.com>
Date: Fri Sep 20 12:49:15 2019 -0300
15648: update documentation adding upgrade to rh-python36
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index e1e29ed12..2d379f5e1 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -94,10 +94,17 @@ The "postgres-contrib package":https://www.postgresql.org/docs/10/contrib.html h
Subsequently, the <code class="userinput">psql -d 'arvados_production' -c '\dx'</code> command will display the installed extensions for the arvados_production database. This list should now contain @pg_trgm at .
+
h4. Migrating to centralized config.yml
See "Migrating Configuration":config-migration.html for notes on migrating legacy per-component configuration files to the new centralized @/etc/arvados/config.yml at . To ensure a smooth transition, the per-component config files continue to be read, and take precedence over the centralized configuration.
+h3(#v1_4_1). v1.4.1 (2019-09-20)
+
+h4. Centos7 Python 3 dependency upgraded to rh-python36
+Bug found on "#15648":https://dev.arvados.org/issues/15648, the Python 3 dependency for Centos7 Arvados packages was upgraded from SCL python35 to rh-python36.
+
+
h3(#v1_4_0). v1.4.0 (2019-06-05)
h4. Populating the new file_count and file_size_total columns on the collections table
@@ -191,9 +198,6 @@ h4. python-arvados-cwl-runner deb/rpm package now conflicts with python-cwltool
As part of story "#9945":https://dev.arvados.org/issues/9945, the distribution packaging (deb/rpm) of our Python packages has changed. The python-arvados-cwl-runner package now includes a version of cwltool. If present, the python-cwltool and cwltool distribution packages will need to be uninstalled before the python-arvados-cwl-runner deb or rpm package can be installed.
-h4. Centos7 Python 3 dependency upgraded to rh-python35
-
-As part of story "#9945":https://dev.arvados.org/issues/9945, the Python 3 dependency for Centos7 Arvados packages was upgraded from SCL python33 to rh-python35.
h4. Centos7 package for libpam-arvados depends on the python-pam package, which is available from EPEL
commit c9c62c7714f87f2a86f8137f9a0675550078f158
Author: Fernando Monserrat <fmonserrat at veritasgenetics.com>
Date: Thu Sep 19 15:57:59 2019 -0300
15648: update to rh-python36
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile
index 7219edb37..916c4abbb 100644
--- a/build/package-build-dockerfiles/centos7/Dockerfile
+++ b/build/package-build-dockerfiles/centos7/Dockerfile
@@ -39,8 +39,8 @@ RUN ln -s /usr/local/node-v6.11.2-linux-x64/bin/* /usr/local/bin/
# Need to "touch" RPM database to workaround bug in interaction between
# overlayfs and yum (https://bugzilla.redhat.com/show_bug.cgi?id=1213602)
-RUN touch /var/lib/rpm/* && yum -q -y install rh-python35
-RUN scl enable rh-python35 "easy_install-3.5 pip" && easy_install-2.7 pip
+RUN touch /var/lib/rpm/* && yum -q -y install rh-python36
+RUN scl enable rh-python36 "easy_install-3.6 pip" && easy_install-2.7 pip
# Add epel, we need it for the python-pam dependency
RUN wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
@@ -52,4 +52,4 @@ RUN git clone --depth 1 git://git.curoverse.com/arvados.git /tmp/arvados && cd /
RUN pip install --upgrade setuptools
ENV WORKSPACE /arvados
-CMD ["scl", "enable", "rh-python35", "/usr/local/rvm/bin/rvm-exec default bash /jenkins/run-build-packages.sh --target centos7"]
+CMD ["scl", "enable", "rh-python36", "/usr/local/rvm/bin/rvm-exec default bash /jenkins/run-build-packages.sh --target centos7"]
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index bebcae065..fd313cf10 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -127,7 +127,7 @@ case "$TARGET" in
PYTHON2_INSTALL_LIB=lib/python$PYTHON2_VERSION/site-packages
PYTHON3_PACKAGE=$(rpm -qf "$(which python$PYTHON3_VERSION)" --queryformat '%{NAME}\n')
PYTHON3_PKG_PREFIX=$PYTHON3_PACKAGE
- PYTHON3_PREFIX=/opt/rh/rh-python35/root/usr
+ PYTHON3_PREFIX=/opt/rh/rh-python36/root/usr
PYTHON3_INSTALL_LIB=lib/python$PYTHON3_VERSION/site-packages
export PYCURL_SSL_LIBRARY=nss
;;
diff --git a/services/dockercleaner/arvados-docker-cleaner.service b/services/dockercleaner/arvados-docker-cleaner.service
index 29697e440..fca8d8b12 100644
--- a/services/dockercleaner/arvados-docker-cleaner.service
+++ b/services/dockercleaner/arvados-docker-cleaner.service
@@ -23,7 +23,7 @@ RestartPreventExitStatus=2
# This unwieldy ExecStart command detects at runtime whether
# arvados-docker-cleaner is installed with the Python 3.3 Software
# Collection, and if so, invokes it with the "scl" wrapper.
-ExecStart=/bin/sh -c 'if [ -e /opt/rh/rh-python35/root/bin/arvados-docker-cleaner ]; then exec scl enable rh-python35 arvados-docker-cleaner; else exec arvados-docker-cleaner; fi'
+ExecStart=/bin/sh -c 'if [ -e /opt/rh/rh-python36/root/bin/arvados-docker-cleaner ]; then exec scl enable rh-python36 arvados-docker-cleaner; else exec arvados-docker-cleaner; fi'
# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
StartLimitInterval=0
commit a4eb0a4608e55f50949fa5d89242cd3c3220cfd8
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Thu Sep 19 09:52:44 2019 -0400
Count "failed to start services" as failure, not success.
No issue #
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/build/run-tests.sh b/build/run-tests.sh
index ec6ced222..0c7909c6a 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -739,6 +739,7 @@ do_test() {
;;
*)
if ! start_services; then
+ checkexit 1 "$1 tests"
title "test $1 -- failed to start services"
return 1
fi
commit 6d9cf83f3f579b65d05393f7ebe3a999d6f0fd35
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Thu Sep 12 15:57:02 2019 -0400
15615: Don't use -v for workbench_profile/benchmark.
Verbose mode causes benchmarks to fail.
.../.gem/ruby/2.5.0/gems/railties-5.0.7.2/lib/rails/test_unit/reporter.rb:66:in
`%': can't convert nil into Float (TypeError)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/build/run-tests.sh b/build/run-tests.sh
index ea4d6e4bd..ec6ced222 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -1107,13 +1107,13 @@ test_apps/workbench_integration() {
test_apps/workbench_benchmark() {
local TASK="test:benchmark"
cd "$WORKSPACE/apps/workbench" \
- && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench_benchmark]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} ${testargs[apps/workbench_benchmark]}
}
test_apps/workbench_profile() {
local TASK="test:profile"
cd "$WORKSPACE/apps/workbench" \
- && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench_profile]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} ${testargs[apps/workbench_profile]}
}
install_deps() {
commit 0a283d9af9472e011a562feb39b3fd5c973e4e12
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Thu Sep 12 14:04:06 2019 -0400
15615: Don't retry skipped tests.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index 69cf43b1a..28a7fa513 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -360,7 +360,7 @@ module Minitest
raise
rescue Exception => e
n += 1
- raise if n > 2
+ raise if n > 2 || e.is_a?(Skip)
STDERR.puts "Test failed, retrying (##{n})"
retry
end
commit 6bbea9ea2fa051a45073aeeebcafbe099021c741
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Thu Sep 12 13:53:19 2019 -0400
15615: Fix wrong rake task being used when wb1 testargs supplied.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/build/run-tests.sh b/build/run-tests.sh
index d70722272..ea4d6e4bd 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -1051,7 +1051,7 @@ test_govendor() {
test_services/api() {
rm -f "$WORKSPACE/services/api/git-commit.version"
cd "$WORKSPACE/services/api" \
- && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test TESTOPTS='-v -d' ${testargs[services/api]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test TESTOPTS=\'-v -d\' ${testargs[services/api]}
}
test_sdk/ruby() {
@@ -1088,47 +1088,32 @@ test_services/nodemanager_integration() {
test_apps/workbench_units() {
local TASK="test:units"
- if [[ -n "${testargs[apps/workbench]}" ]] || [[ -n "${testargs[apps/workbench_units]}" ]]; then
- TASK="test"
- fi
cd "$WORKSPACE/apps/workbench" \
- && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} TESTOPTS='-v -d' ${testargs[apps/workbench]} ${testargs[apps/workbench_units]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench]} ${testargs[apps/workbench_units]}
}
test_apps/workbench_functionals() {
local TASK="test:functionals"
- if [[ -n "${testargs[apps/workbench]}" ]] || [[ -n "${testargs[apps/workbench_functionals]}" ]]; then
- TASK="test"
- fi
cd "$WORKSPACE/apps/workbench" \
- && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} TESTOPTS='-v -d' ${testargs[apps/workbench]} ${testargs[apps/workbench_functionals]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench]} ${testargs[apps/workbench_functionals]}
}
test_apps/workbench_integration() {
local TASK="test:integration"
- if [[ -n "${testargs[apps/workbench]}" ]] || [[ -n "${testargs[apps/workbench_integration]}" ]]; then
- TASK="test"
- fi
cd "$WORKSPACE/apps/workbench" \
- && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} TESTOPTS='-v -d' ${testargs[apps/workbench]} ${testargs[apps/workbench_integration]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench]} ${testargs[apps/workbench_integration]}
}
test_apps/workbench_benchmark() {
local TASK="test:benchmark"
- if [[ -n "${testargs[apps/workbench]}" ]] || [[ -n "${testargs[apps/workbench_benchmark]}" ]]; then
- TASK="test"
- fi
cd "$WORKSPACE/apps/workbench" \
- && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} ${testargs[apps/workbench_benchmark]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench_benchmark]}
}
test_apps/workbench_profile() {
local TASK="test:profile"
- if [[ -n "${testargs[apps/workbench]}" ]] || [[ -n "${testargs[apps/workbench_profile]}" ]]; then
- TASK="test"
- fi
cd "$WORKSPACE/apps/workbench" \
- && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} ${testargs[apps/workbench_profile]}
+ && eval env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake ${TASK} TESTOPTS=\'-v -d\' ${testargs[apps/workbench_profile]}
}
install_deps() {
commit c7e32be4c2831d9f8a77c0f5a5e21bb736d2204b
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Wed Sep 11 16:42:58 2019 -0400
15615: Retry failed wb1 tests twice before giving up.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index 1d26deefa..69cf43b1a 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -348,3 +348,29 @@ end
# Reset fixtures now (i.e., before any tests run).
ActiveSupport::TestCase.reset_api_fixtures_now
+
+module Minitest
+ class Test
+ def capture_exceptions *args
+ begin
+ n = 0
+ begin
+ yield
+ rescue *PASSTHROUGH_EXCEPTIONS
+ raise
+ rescue Exception => e
+ n += 1
+ raise if n > 2
+ STDERR.puts "Test failed, retrying (##{n})"
+ retry
+ end
+ rescue *PASSTHROUGH_EXCEPTIONS
+ raise
+ rescue Assertion => e
+ self.failures << e
+ rescue Exception => e
+ self.failures << UnexpectedError.new(e)
+ end
+ end
+ end
+end
commit 9635a624bcd0aa8ead0b0005a4a50a18400ad1a3
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Wed Sep 11 16:42:42 2019 -0400
15615: Don't save screenshots of skipped tests.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index 0c66e59c8..7209f2b6c 100644
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -206,7 +206,7 @@ class ActionDispatch::IntegrationTest
end
teardown do
- if not passed?
+ if !passed? && !skipped?
screenshot
end
if Capybara.current_driver == :selenium
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list