From ef921932e4f209397a966b5a6d161dba10cd9fc6 Mon Sep 17 00:00:00 2001 From: David Conner Date: Mon, 26 Aug 2024 23:41:12 -0400 Subject: [PATCH] enable separate CI tests for jazzy and rolling; remove some stray spam --- .github/workflows/flexbe_ci.yml | 6 +++++- flexbe_core/flexbe_core/core/operatable_state.py | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/flexbe_ci.yml b/.github/workflows/flexbe_ci.yml index d066c66..e62461e 100644 --- a/.github/workflows/flexbe_ci.yml +++ b/.github/workflows/flexbe_ci.yml @@ -8,12 +8,16 @@ jobs: test: strategy: matrix: - ros: [rolling] + ros: [jazzy, rolling] include: - os: ubuntu-24.04 ros: rolling python: python3 ci_branch: ros2-devel + - os: ubuntu-24.04 + ros: jazzy + python: python3 + ci_branch: ros2-devel runs-on: ${{ matrix.os }} env: diff --git a/flexbe_core/flexbe_core/core/operatable_state.py b/flexbe_core/flexbe_core/core/operatable_state.py index 3b3970a..1fc9a01 100644 --- a/flexbe_core/flexbe_core/core/operatable_state.py +++ b/flexbe_core/flexbe_core/core/operatable_state.py @@ -85,7 +85,7 @@ def _operatable_execute(self, *args, **kwargs): # autonomy level is high enough, report the executed transition elif outcome is not None and outcome in self.outcomes: - Logger.localinfo(f"controlled State '{self.name}' from '{self.path}'permitting outcome '{outcome}' {self.__class__.__name__}") + # Logger.localinfo(f"controlled State '{self.name}' from '{self.path}'permitting outcome '{outcome}' {self.__class__.__name__}") self._force_transition = False return outcome @@ -101,8 +101,8 @@ def _publish_outcome(self, outcome): return outcome_index = self.outcomes.index(outcome) - Logger.localinfo('Publish outcome: State result: %s > %s (%d) (%d) (%s)' - % (self.name, outcome, outcome_index, self.state_id, self.__class__.__name__)) + # Logger.localinfo('Publish outcome: State result: %s > %s (%d) (%d) (%s)' + # % (self.name, outcome, outcome_index, self.state_id, self.__class__.__name__)) # 0 outcome status denotes no outcome, not index so add +1 for valid outcome (subtract in mirror) self._pub.publish(Topics._OUTCOME_TOPIC, UInt32(data=StateMap.hash(self, outcome_index))) self._pub.publish(Topics._DEBUG_TOPIC, String(data='%s > %s' % (self.path, outcome)))