Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix job cancellation #182

Merged
merged 3 commits into from
Mar 25, 2019
Merged

Fix job cancellation #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf0a27f
demonstrate issue #176
johnbradley Mar 25, 2019
dd3f64f
fixes #176
johnbradley Mar 25, 2019
f70845a
improve test_read_record_output_project_details
johnbradley Mar 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion lando/k8s/jobmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ def __init__(self, cluster_api, config, job):
JobLabels.BESPIN_JOB: BESPIN_JOB_LABEL_VALUE,
JobLabels.JOB_ID: str(self.job.id),
}
self.label_selector = '{}={}'.format(JobLabels.BESPIN_JOB, BESPIN_JOB_LABEL_VALUE)
label_ary = ['{}={}'.format(k,v) for k,v in self.default_metadata_labels.items()]
self.label_selector = ','.join(label_ary)

def make_job_labels(self, job_step_type):
labels = dict(self.default_metadata_labels)
Expand Down
15 changes: 12 additions & 3 deletions lando/k8s/tests/test_jobmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,8 @@ def test_read_record_output_project_details(self):

self.assertEqual(project_id, '123')
self.assertEqual(readme_file_id, '456')
mock_cluster_api.list_pods.assert_called_with(
label_selector='bespin-job=true,bespin-job-id=51,bespin-job-step=record_output_project')

def test_read_record_output_project_details_pod_not_found(self):
mock_cluster_api = Mock()
Expand Down Expand Up @@ -497,15 +499,15 @@ def test_cleanup_record_output_project_job(self):
])

def test_cleanup_all(self):
mock_job = Mock()
mock_job.metadata.name = 'job_1'
self.mock_job.id = 1
self.mock_job.metadata.name = 'job_1'
mock_config_map = Mock()
mock_config_map.metadata.name = 'config_map_1'
mock_pvc = Mock()
mock_pvc.metadata.name = 'pvc_1'

mock_cluster_api = Mock()
mock_cluster_api.list_jobs.return_value = [mock_job]
mock_cluster_api.list_jobs.return_value = [self.mock_job]
mock_cluster_api.list_config_maps.return_value = [mock_config_map]
mock_cluster_api.list_persistent_volume_claims.return_value = [mock_pvc]
mock_config = Mock(storage_class_name='nfs')
Expand All @@ -517,6 +519,13 @@ def test_cleanup_all(self):
mock_cluster_api.delete_config_map.assert_called_with('config_map_1')
mock_cluster_api.delete_persistent_volume_claim.assert_called_with('pvc_1')

mock_cluster_api.list_persistent_volume_claims.assert_called_with(
label_selector='bespin-job=true,bespin-job-id=1')
mock_cluster_api.list_jobs.assert_called_with(
label_selector='bespin-job=true,bespin-job-id=1')
mock_cluster_api.list_config_maps.assert_called_with(
label_selector='bespin-job=true,bespin-job-id=1')


class TestNames(TestCase):
def test_constructor(self):
Expand Down