Commit ae5abd2f authored by Abhijeet Deshkar's avatar Abhijeet Deshkar
Browse files

Merge branch 'sah-1898' into 'master'

SAH-1898: Update rules for Aborted State

See merge request !373
parents bb5faee7 a49447bf
Loading
Loading
Loading
Loading
Loading
Compare c44dfb6a to 93e0fc4a
Original line number Diff line number Diff line
Subproject commit c44dfb6aa6eb7a0943da0256b1050d59951f35c2
Subproject commit 93e0fc4a6f3637483e8ec219aa16e1a8128a11f9
+3 −3
Original line number Diff line number Diff line
"""Release information for Python Package"""

name="""ska-tmc-subarraynode"""
version="1.4.0"
version="1.5.0"
version_info=version.split(".")
description="""Subarray Node"""
author="Team Sahyadri, Team Himalaya"
@@ -10,6 +10,6 @@ license="""BSD-3-Clause"""
url="""https://www.skaobservatory.org"""
copyright=""""""

release=1.4.0
tag=1.4.0
release=1.5.0
tag=1.5.0
+3 −3
Original line number Diff line number Diff line
"""Release information for Python Package"""

name="""ska-tmc-subarraynode"""
version="1.4.0"
version="1.5.0"
version_info=version.split(".")
description="""Subarray Node"""
author="Team Sahyadri, Team Himalaya"
@@ -10,5 +10,5 @@ license="""BSD-3-Clause"""
url="""https://www.skaobservatory.org"""
copyright=""""""

release=1.4.0
tag=1.4.0
release=1.5.0
tag=1.5.0
+10 −0
Original line number Diff line number Diff line
@@ -5,6 +5,16 @@ Change Log
All notable changes to this project will be documented in this file.
This project adheres to `Semantic Versioning <http://semver.org/>`_.

[1.5.0]
*******
Fixed
------

* Update rules to consider `longRunningCommandResult` in addition to 
  `ObsState=Aborted` for Abort Command.



[1.4.0]
*******
Added
+2 −1
Original line number Diff line number Diff line
@@ -76,8 +76,9 @@ ITANGO_DOCKER_IMAGE = $(CAR_OCI_REGISTRY_HOST)/ska-tango-images-tango-itango:9.3
K8S_TEST_RUNNER = test-runner-$(HELM_RELEASE)
ADDMARK ?= #additional markers
# override for python-test - must not have the above --true-context
TEST_THREADS ?= 12
ifeq ($(MAKECMDGOALS),python-test)
ADD_ARGS += -n12 --forked --count=$(PYTHON_TEST_COUNT)
ADD_ARGS += -n$(TEST_THREADS) --forked --count=$(PYTHON_TEST_COUNT)
MARK = not post_deployment and not acceptance $(ADDMARK)
endif
ifeq ($(MAKECMDGOALS),k8s-test)
Loading