Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: c4a1ffa2daa56367cd6a99b60a621f03e061cfd8 https://github.com/galaxyproject/galaxy/commit/c4a1ffa2daa56367cd6a99b60a621... Author: John Chilton jmchilton@gmail.com Date: 2017-11-03 (Fri, 03 Nov 2017)

Changed paths: A .ci/jenkins/selenium-compose/Dockerfile A .ci/jenkins/selenium-compose/docker-compose.yml A .ci/jenkins/selenium-compose/galaxy.ini A .ci/jenkins/selenium-compose/run_galaxy.bash A .ci/jenkins/selenium-compose/run_tests.sh R .ci/jenkins/selenium/Dockerfile R .ci/jenkins/selenium/docker-compose.yml R .ci/jenkins/selenium/galaxy.ini R .ci/jenkins/selenium/run_galaxy.bash M .ci/jenkins/selenium/run_tests.sh M run_tests.sh

Log Message: ----------- Lighter weight Selenium test setup for PRs.

The Dockerfile and image update in #4900 baked chrome, chrome-wrapper, xvfb, and a Selenium server into the default Galaxy testing image. This means we should no longer need to run three docker containers in a compose setup to run Selenium tests. This swaps the script target used by Jenkins to use this newer variant of the tests.

In addition to simply consuming less CPU and booting up much faster thanks to pre-installed dependencies and pre-migrated database, this setup is much easier to cleanup and so we don't need to restrict it to one test per host - these tests I think should run just like API and framework tests. This should also be easier for people running tests locally.

I've kept the old compose setup around and I'll setup a Jenkins job against dev that continues to run it periodically (just not on PRs). It does testing of proxy prefix things this variant doesn't and serves as a good reference implementation for multi-container Galaxy testing - which we may wish to do for various categories of tests in the future. The multi-container variant makes it much easier to bring in various services - lots of which one can imagine writing useful Galaxy tests for - AMQP, statistics collection, Docker itself, etc....

Commit: 3a1ca26339b928c362d9f7b9f0db9cecca364c77 https://github.com/galaxyproject/galaxy/commit/3a1ca26339b928c362d9f7b9f0db9... Author: John Chilton jmchilton@gmail.com Date: 2017-11-03 (Fri, 03 Nov 2017)

Changed paths: M test/selenium_tests/test_published_histories_grid.py

Log Message: ----------- Fix published histories grid test.

Commit: ed0ac48985fa061a3a103fb819990fc50a0831d4 https://github.com/galaxyproject/galaxy/commit/ed0ac48985fa061a3a103fb819990... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-11-04 (Sat, 04 Nov 2017)

Changed paths: A .ci/jenkins/selenium-compose/Dockerfile A .ci/jenkins/selenium-compose/docker-compose.yml A .ci/jenkins/selenium-compose/galaxy.ini A .ci/jenkins/selenium-compose/run_galaxy.bash A .ci/jenkins/selenium-compose/run_tests.sh R .ci/jenkins/selenium/Dockerfile R .ci/jenkins/selenium/docker-compose.yml R .ci/jenkins/selenium/galaxy.ini R .ci/jenkins/selenium/run_galaxy.bash M .ci/jenkins/selenium/run_tests.sh M run_tests.sh M test/selenium_tests/test_published_histories_grid.py

Log Message: ----------- Merge pull request #4925 from jmchilton/selenium_lite__fewer_calories_same_great_taste

Lighter weight Selenium test setup for PRs.

Compare: https://github.com/galaxyproject/galaxy/compare/e4b2049a37d6...ed0ac48985fa