Brett Smith [Fri, 26 Sep 2014 21:06:15 +0000 (17:06 -0400)]
3848: Package version numbers use UTC timestamps.
Per note-9 in the issue.
Brett Smith [Fri, 26 Sep 2014 20:44:52 +0000 (16:44 -0400)]
Merge branch 'master' into 3848-egg-default-git-tag-wip
Tim Pierce [Fri, 26 Sep 2014 19:51:10 +0000 (15:51 -0400)]
Merge branch '3901-component-rendering-errors'
Refs #3901.
Tim Pierce [Fri, 26 Sep 2014 19:42:12 +0000 (15:42 -0400)]
Merge branch 'master' into 3901-component-rendering-errors
Conflicts:
apps/workbench/app/helpers/pipeline_instances_helper.rb
radhika [Fri, 26 Sep 2014 19:33:40 +0000 (15:33 -0400)]
closes #3836
Merge branch '3836-remove-collection-from-project-bug'
radhika [Fri, 26 Sep 2014 19:32:52 +0000 (15:32 -0400)]
Merge branch 'master' into 3836-remove-collection-from-project-bug
Tim Pierce [Fri, 26 Sep 2014 17:45:43 +0000 (13:45 -0400)]
3901: added unit test for pipeline rendering
Tom Clegg [Fri, 26 Sep 2014 15:29:38 +0000 (11:29 -0400)]
Fix typo in error message. Refs #3961
Peter Amstutz [Fri, 26 Sep 2014 14:31:49 +0000 (10:31 -0400)]
Merge branch '3899-crunch-use-job-state' closes #3899
Peter Amstutz [Fri, 26 Sep 2014 14:23:03 +0000 (10:23 -0400)]
3899: Uncomment line that was commented out for debugging and committed by mistake.
Peter Amstutz [Fri, 26 Sep 2014 14:20:15 +0000 (10:20 -0400)]
3899: pipeline_instances_helper: Don't set :state if it's already set. Add newline to jobs.yml.
Peter Amstutz [Fri, 26 Sep 2014 13:55:43 +0000 (09:55 -0400)]
Merge branch '3168-crunch-git-fetch' closes #3168
Peter Amstutz [Fri, 26 Sep 2014 13:48:58 +0000 (09:48 -0400)]
Remove useless take() and untake() methods.
Peter Amstutz [Fri, 26 Sep 2014 13:47:52 +0000 (09:47 -0400)]
3168: Instead of crashing using save! log an error and go to the next job.
Peter Amstutz [Fri, 26 Sep 2014 13:01:22 +0000 (09:01 -0400)]
Merge remote-tracking branch 'origin/master' into 3899-crunch-use-job-state
Peter Amstutz [Fri, 26 Sep 2014 12:41:58 +0000 (08:41 -0400)]
3899: jobs_controller uses state = Queued instead of multiple state columns.
Updated fixture so that tests pass.
Tom Clegg [Fri, 26 Sep 2014 05:46:50 +0000 (01:46 -0400)]
Merge branch '3991-docker-workbench-address' closes #3991
Tom Clegg [Fri, 26 Sep 2014 01:55:17 +0000 (21:55 -0400)]
3991: Merge branch 'master' into 3991-docker-workbench-address
Peter Amstutz [Fri, 26 Sep 2014 01:26:27 +0000 (21:26 -0400)]
3168: Fail on git tag collision instead of putting job back into the queue.
Peter Amstutz [Fri, 26 Sep 2014 00:41:41 +0000 (20:41 -0400)]
3899: Set :state in pipeline_instance_helper.rb and remove Job::state.
Tom Clegg [Thu, 25 Sep 2014 23:46:08 +0000 (19:46 -0400)]
3991: Fix config checks in admin_notifier.
Tom Clegg [Thu, 25 Sep 2014 20:30:33 +0000 (16:30 -0400)]
3991: Change docker default to "no root url redirect". Make "not found" message more friendly.
Tim Pierce [Thu, 25 Sep 2014 20:20:48 +0000 (16:20 -0400)]
Merge branch 'master' into 3901-component-rendering-errors
Tim Pierce [Thu, 25 Sep 2014 19:08:18 +0000 (15:08 -0400)]
3901: allow job to be either Hash or Job
Refactoring to ensure that a component "job" data structure may either
be a Hash (parsed directly from the component's JSON representation) or
a real Job object retrieved from the database.
When rendering a pipeline, parse the :started_at and :finished_at
timestamp fields, respectively, if necessary.
Peter Amstutz [Thu, 25 Sep 2014 19:24:52 +0000 (15:24 -0400)]
3988: Add note to Job.state. Replace logic to compute state based on
success/running columns with the same logic as used on apiserver.
Tim Pierce [Thu, 25 Sep 2014 19:09:25 +0000 (15:09 -0400)]
bug fix: args_retries => args.retries
No issue #
Peter Amstutz [Thu, 25 Sep 2014 19:01:44 +0000 (15:01 -0400)]
3899: Shorten count of ended/succeed/failed in a-r-p-i with some clever Ruby.
Improve reporting to test for state == Cancelled instead of looking at
cancelled_at, and distinguish between cancelled the state being unexpectedly
changed to success/failed. pipeline_instances_helper uses state attribute.
radhika [Thu, 25 Sep 2014 18:35:55 +0000 (14:35 -0400)]
Merge branch 'master' into 3836-remove-collection-from-project-bug
Tom Clegg [Thu, 25 Sep 2014 17:52:51 +0000 (13:52 -0400)]
3991: Use db:structure:load and db:seed instead of db:setup: the database already exists here.
Tom Clegg [Thu, 25 Sep 2014 18:30:09 +0000 (14:30 -0400)]
3991: Handle "no workbench_address configured" more gracefully.
* Remove example config from default production section.
* Follow config rule: false = feature disabled, nil = sysadmin error.
* Respond 404 at root url if no workbench_address is configured.
* Never redirect to workbench if client requested JSON.
Tom Clegg [Thu, 25 Sep 2014 18:16:33 +0000 (14:16 -0400)]
3991: Run passenger script using bundle exec.
Passenger was installed in a previous step, but that was done using
"bundle install", which installs into ./vendor/bundle instead of a
system-wide install dir. This way, we install the passenger version
listed in services/api/Gemfile.lock instead of installing some other
version (or failing completely).
Tom Clegg [Thu, 25 Sep 2014 18:11:17 +0000 (14:11 -0400)]
3991: Set workbench_address in docker config.
Tim Pierce [Thu, 25 Sep 2014 18:09:02 +0000 (14:09 -0400)]
3901: improve component rendering error reports
The "Components" tab on the /pipeline_instances page now includes the
error that was encountered, and a collapsed panel with the full backtrace.
Ward Vandewege [Thu, 25 Sep 2014 17:56:10 +0000 (13:56 -0400)]
In our docker jobs image: use our debian packages for the python sdk and
fuse driver.
No issue #
Ward Vandewege [Thu, 25 Sep 2014 17:54:46 +0000 (13:54 -0400)]
In our docker base image: do not rely on pgp.mit.edu, use
pool.sks-keyservers.net instead.
No issue #
Peter Amstutz [Thu, 25 Sep 2014 13:16:14 +0000 (09:16 -0400)]
3988: Job.queue uses "state = Queued" instead of previous multi-column-null test.
Peter Amstutz [Thu, 25 Sep 2014 03:16:44 +0000 (23:16 -0400)]
3168: Check internal git repository if the commit already exists before calling
fetch-pack. Check if a job tag has already been created or not, and if the tag
already exists, that it points to the expected commit.
radhika [Thu, 25 Sep 2014 02:10:45 +0000 (22:10 -0400)]
refs #3889: Merge monkey patch code updates to detect tests that are reusing ActionController::TestCase.
For now, print warning instead of raising error. After the tests are corrected, we can change this behavior to raise an error.
Merge branch '3889-functional-testing'
radhika [Thu, 25 Sep 2014 02:03:23 +0000 (22:03 -0400)]
Merge branch 'master' into 3889-functional-testing
Ward Vandewege [Thu, 25 Sep 2014 01:57:25 +0000 (21:57 -0400)]
API server: setting workbench_address is not required. This unbreaks the
docker build for the api server image.
refs #3038
Ward Vandewege [Thu, 25 Sep 2014 01:42:10 +0000 (21:42 -0400)]
Protect the one place in the api server code where we assume the
workbench_address parameter is always set, it is in fact optional.
refs #3038
radhika [Thu, 25 Sep 2014 01:40:26 +0000 (21:40 -0400)]
Merge branch 'master' into 3889-functional-testing
radhika [Thu, 25 Sep 2014 00:15:51 +0000 (20:15 -0400)]
Merge branch 'master' into 3836-remove-collection-from-project-bug
radhika [Thu, 25 Sep 2014 00:14:40 +0000 (20:14 -0400)]
3836: update the fuse test to expect the newly added collections.
Tom Clegg [Wed, 24 Sep 2014 21:45:41 +0000 (17:45 -0400)]
Merge branch '3960-show-more-repos' closes #3960
radhika [Wed, 24 Sep 2014 21:33:53 +0000 (17:33 -0400)]
3836: if rescued an error other than unique constraint violation, raise it back.
radhika [Wed, 24 Sep 2014 21:16:44 +0000 (17:16 -0400)]
3836: minor update to test assertion
radhika [Wed, 24 Sep 2014 21:06:38 +0000 (17:06 -0400)]
3836: add integration test to verify name change when a collection is removed from a project,
and another collection with the same name already exists in the home project.
Tom Clegg [Wed, 24 Sep 2014 19:49:02 +0000 (15:49 -0400)]
3960: Merge branch 'master' into 3960-show-more-repos
Brett Smith [Wed, 24 Sep 2014 19:34:21 +0000 (15:34 -0400)]
Merge branch '2881-node-has-job-wip'
Refs #2881. Closes #3944.
Brett Smith [Mon, 22 Sep 2014 15:11:28 +0000 (11:11 -0400)]
2881: crunch-dispatch updates nodes' job assignments.
With this commit, crunch-dispatch updates all the information that
update_node_attributes used to, so it's removed.
Brett Smith [Mon, 22 Sep 2014 15:10:42 +0000 (11:10 -0400)]
2881: API server associates nodes with their assigned jobs.
This will enable us to write better administrative tools (like the
Node Manager) and dashboards.
Tim Pierce [Wed, 24 Sep 2014 19:05:03 +0000 (15:05 -0400)]
Merge branch '3413-keep-trash-list'
Closes #3413.
Peter Amstutz [Wed, 24 Sep 2014 18:36:21 +0000 (14:36 -0400)]
3899: crunch-dispatch uses state column to mark crashed jobs as failed.
Peter Amstutz [Wed, 24 Sep 2014 18:21:50 +0000 (14:21 -0400)]
Merge remote-tracking branch 'origin/master' into 3988-crunch-use-job-state
Peter Amstutz [Wed, 24 Sep 2014 18:11:33 +0000 (14:11 -0400)]
3899: Fix syntax errors in arv-run-pipeline-instance, and update job record if
job is queued or running.
radhika [Wed, 24 Sep 2014 17:52:51 +0000 (13:52 -0400)]
Merge branch 'master' into 3889-functional-testing
radhika [Wed, 24 Sep 2014 17:52:17 +0000 (13:52 -0400)]
Merge branch 'master' into 3836-remove-collection-from-project-bug
radhika [Wed, 24 Sep 2014 17:46:45 +0000 (13:46 -0400)]
closes #3038
Merge branch '3038-default-port-numbers'
radhika [Wed, 24 Sep 2014 17:44:23 +0000 (13:44 -0400)]
3889: update test_helper.rb with Tom's updates.
Peter Amstutz [Wed, 24 Sep 2014 17:32:01 +0000 (13:32 -0400)]
3988: look at job state instead of cancelled_at to determine if the job should
be stopped.
Peter Amstutz [Wed, 24 Sep 2014 17:28:58 +0000 (13:28 -0400)]
3988: Update crunch-job, arv-run-pipeline-instance and workbench to read/write
"state" field of jobs instead of using running/success (+
cancelled_at/started_at/finished_at) to figure out what state the job is in.
radhika [Wed, 24 Sep 2014 17:28:22 +0000 (13:28 -0400)]
Merge branch '3889-functional-testing-TC' into 3889-functional-testing
radhika [Wed, 24 Sep 2014 17:24:30 +0000 (13:24 -0400)]
Merge branch 'master' into 3889-functional-testing
radhika [Wed, 24 Sep 2014 17:06:22 +0000 (13:06 -0400)]
3038: address review feeback; change the config parametter values in default yml files to avoid conflicts
Tim Pierce [Wed, 24 Sep 2014 15:45:47 +0000 (11:45 -0400)]
3413: code review update
Tom Clegg [Wed, 24 Sep 2014 15:41:24 +0000 (11:41 -0400)]
3889: Clean up counter checks. For now, warn instead of failing.
radhika [Wed, 24 Sep 2014 14:21:20 +0000 (10:21 -0400)]
3038: revert update to remove implementation that was accidentatlly pushed to this branch instead of 3836 branch!
radhika [Wed, 24 Sep 2014 14:15:22 +0000 (10:15 -0400)]
3836: if there is a unique constraint violation when a collection is removed from a project,
which happens if there is already a collection with that same name in the Home project,
rename the collection to ensure the removal process can complete.
radhika [Wed, 24 Sep 2014 14:02:58 +0000 (10:02 -0400)]
Merge branch 'master' into 3038-default-port-numbers
radhika [Wed, 24 Sep 2014 14:00:51 +0000 (10:00 -0400)]
3038: if there is a unique constraint violation when a collection is removed from a project,
which happens if there is already a collection with that same name in the Home project,
rename the collection to ensure the removal process can complete.
Ward Vandewege [Wed, 24 Sep 2014 01:14:37 +0000 (21:14 -0400)]
Merge branch '3967-improve-keepstore-logging'
refs #3967
Ward Vandewege [Wed, 24 Sep 2014 01:13:11 +0000 (21:13 -0400)]
Fix typos in workbench language.
No issue #
Ward Vandewege [Tue, 23 Sep 2014 21:38:55 +0000 (17:38 -0400)]
Make keepstore log normal operation with more detail, and follow the
standard apache logging pattern.
refs #3967
Tom Clegg [Tue, 23 Sep 2014 20:32:57 +0000 (16:32 -0400)]
3960: Fix readonly/writable flag on repo list. Add tests.
Ward Vandewege [Tue, 23 Sep 2014 18:59:48 +0000 (14:59 -0400)]
* Do not blow up when arv-get requests a collection that gets a 404 from the api server.
* Be more consistent in naming of error variables.
no issue #
Peter Amstutz [Tue, 23 Sep 2014 18:48:17 +0000 (14:48 -0400)]
Bugfix time display, also bugfix for job state "Completed" -> "Complete". refs #3187
Peter Amstutz [Tue, 23 Sep 2014 18:35:54 +0000 (14:35 -0400)]
Bugfix extra space in display in render_runtime and queued time for pipeline.
refs #3187
Tom Clegg [Tue, 23 Sep 2014 18:32:09 +0000 (14:32 -0400)]
3960: Make editable? return false or true, never nil.
Tom Clegg [Tue, 23 Sep 2014 18:31:09 +0000 (14:31 -0400)]
3960: Remove unused has_permission? method.
Peter Amstutz [Tue, 23 Sep 2014 17:58:50 +0000 (13:58 -0400)]
Merge branch '3605-improved-dashboard' refs #3605
Peter Amstutz [Tue, 23 Sep 2014 17:50:52 +0000 (13:50 -0400)]
3605: Remove total nodes from compute summary table.
radhika [Tue, 23 Sep 2014 17:14:41 +0000 (13:14 -0400)]
Merge branch 'master' into 3038-default-port-numbers
radhika [Tue, 23 Sep 2014 17:10:53 +0000 (13:10 -0400)]
3038: test needed minor update to match current pipeline instance display.
Peter Amstutz [Tue, 23 Sep 2014 15:20:54 +0000 (11:20 -0400)]
Merge remote-tracking branch 'origin/master' into 3605-improved-dashboard
Peter Amstutz [Tue, 23 Sep 2014 15:20:16 +0000 (11:20 -0400)]
3605: Rename "default_show" to "title_and_buttons". Revert capitalization
change to "curl". Eliminate excess top margin on page title. Restored
RunningOnClient to running list.
radhika [Tue, 23 Sep 2014 15:10:44 +0000 (11:10 -0400)]
3038: Recommended default port number related update. Now the defaults are as follows:
API server (dev mode): 3030
API server (test mode): 3000
Workbench (dev mode): 3031
Workbench (test mode): 3001
Peter Amstutz [Tue, 23 Sep 2014 14:38:07 +0000 (10:38 -0400)]
3605: Filter out nodes that have a last ping time of more than 1 hour. Add
queue to compute status panel. Refactor utc-date spans to
render_localized_date().
Tom Clegg [Tue, 23 Sep 2014 14:36:36 +0000 (10:36 -0400)]
Report crunch_worker_state=down for nodes not occupying a worker slot. refs #3605
Brett Smith [Tue, 23 Sep 2014 12:33:01 +0000 (08:33 -0400)]
Fixup: Handle case of running inside an unrelated git repo.
`git log` will return empty output in this case.
Peter Amstutz [Tue, 23 Sep 2014 01:51:08 +0000 (21:51 -0400)]
3605: Fallback to 0 (instead of nil) when tasks is empty
Peter Amstutz [Tue, 23 Sep 2014 01:46:56 +0000 (21:46 -0400)]
3605: Check that a pipeline component entry is a hash before trying to render it.
Tom Clegg [Mon, 22 Sep 2014 23:25:04 +0000 (19:25 -0400)]
Revert "Bugfix: do not try to overwrite docker_image_locator if it is already set." refs #3898
This reverts commit
7e27eb2cca7e9e22ad1f56a6f0ecbbc40ad4cb64.
Tom Clegg [Mon, 22 Sep 2014 20:56:06 +0000 (16:56 -0400)]
Merge branch '3898-job-state-attr-TC' closes #3898
Tom Clegg [Mon, 22 Sep 2014 20:54:01 +0000 (16:54 -0400)]
3898: Merge branch 'master' into 3898-job-state-attr-TC
Brett Smith [Mon, 22 Sep 2014 20:51:49 +0000 (16:51 -0400)]
Fixup: Use --first-parent in `git log` calls.
Tom Clegg [Mon, 22 Sep 2014 20:49:28 +0000 (16:49 -0400)]
3898: Assume a job Failed if it has started but state fields indicate Queued.
Brett Smith [Mon, 22 Sep 2014 20:45:19 +0000 (16:45 -0400)]
3848: Python packages build with git tag by default.
This moves the build logic that we currently encode in Jenkins into
our setup.py, and makes it easier for developers to have versions in
sync with real users.
Tom Clegg [Mon, 22 Sep 2014 20:44:26 +0000 (16:44 -0400)]
3898: Assume a job Failed if it is locked but state fields indicate Queued.
Ward Vandewege [Sat, 20 Sep 2014 02:28:37 +0000 (22:28 -0400)]
Bugfix: do not try to overwrite docker_image_locator if it is already set.
refs #3898