Skip to content
Snippets Groups Projects
Commit 38a16ea8 authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

tests should pass again

parent badddc44
Branches
Tags
No related merge requests found
......@@ -455,7 +455,7 @@ integration_test_TMSS_Frontend:
dockerize_TMSS:
stage: dockerize
allow_failure: true
allow_failure: false
script:
- cd build/gnucxx11_opt
- docker build --build-arg TMSS_VERSION=$CI_COMMIT_SHORT_SHA --build-arg TMSS_COPY_DIR=install/opt/lofar -t tmss_django:$CI_COMMIT_SHORT_SHA -f docker/Dockerfile-tmss .
......@@ -544,7 +544,7 @@ unit_and_integration_and_regression_test_TMSS:
- cd build/gnucxx11_opt
- SKIP_PYTHON_COVERAGE=true SKIP_INTEGRATION_TESTS=false SKIP_UNIT_TESTS=false SKIP_REGRESSION_TESTS=false ctest --output-on-failure
interruptible: true
allow_failure: true
allow_failure: false
rules:
- if: '$CI_COMMIT_BRANCH !~ /Front-End-Only/'
needs:
......@@ -711,7 +711,7 @@ deploy-tmss-dockerhub:
artifacts: false
- job: unit_and_integration_and_regression_test_TMSS
artifacts: false
allow_failure: true
allow_failure: false
when: manual
rules:
- if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
......
......@@ -153,13 +153,17 @@ class TestSubtaskSchedulingService(unittest.TestCase):
strategy_template.template['tasks'][obs_task_name]['specifications_doc']['QA'][qa_subtask_type]['enabled'] = True
strategy_template.save()
constraints_template = models.SchedulingConstraintsTemplate.get_version_or_latest(name=strategy_template.template.get('scheduling_constraints_template', {}).get('name', 'constraints'),
version=strategy_template.template.get('scheduling_constraints_template', {}).get('version'))
constraints_doc = constraints_template.get_default_json_document_for_schema()
spec = add_defaults_to_json_object_for_schema(strategy_template.template, strategy_template.scheduling_unit_template.schema)
scheduling_unit_draft = models.SchedulingUnitDraft.objects.create(name="IM HBA LoTSS - 2 Beams",
scheduling_set=models.SchedulingSet.objects.create(**SchedulingSet_test_data()),
specifications_template=strategy_template.scheduling_unit_template,
observation_strategy_template=strategy_template,
scheduling_constraints_doc=get_default_json_object_for_schema(models.SchedulingConstraintsTemplate.get_version_or_latest(name="constraints").schema),
scheduling_constraints_template=models.SchedulingConstraintsTemplate.get_version_or_latest(name="constraints"))
scheduling_constraints_doc=constraints_doc,
scheduling_constraints_template=constraints_template)
update_task_graph_from_specifications_doc(scheduling_unit_draft, spec)
scheduling_unit_blueprint = create_scheduling_unit_blueprint_and_tasks_and_subtasks_from_scheduling_unit_draft(scheduling_unit_draft)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment