fix(hermes): Merges the identical branch bodies into one boolean expression without changing when a heartbeat message is sent. (incident sonar/atlasbot/python:S1871/AZ2y3T24Ky9i4pkIpSiI)

Jenkinsfile

@@ -1,16 +1,11 @@
 pipeline {
   agent {
     kubernetes {
-      // Keep build I/O off the node's runtime USB drive.
-      workspaceVolume dynamicPVC(accessModes: 'ReadWriteOnce', requestsSize: '40Gi', storageClassName: 'ci-scratch')
       defaultContainer 'tester'
       yaml """
 apiVersion: v1
 kind: Pod
 spec:
-  securityContext:
-    fsGroup: 1000
-    fsGroupChangePolicy: OnRootMismatch
   nodeSelector:
     kubernetes.io/arch: arm64
     node-role.kubernetes.io/worker: "true"
@@ -19,9 +14,10 @@ spec:
       requiredDuringSchedulingIgnoredDuringExecution:
         nodeSelectorTerms:
           - matchExpressions:
-              - {key: hardware, operator: In, values: [rpi5, rpi4]}
+              - key: kubernetes.io/hostname
-              - {key: node-role.kubernetes.io/worker, operator: In, values: ["true"]}
+                operator: NotIn
-              - {key: kubernetes.io/hostname, operator: NotIn, values: [titan-04, titan-05, titan-06, titan-08, titan-11, titan-12, titan-13, titan-14, titan-15, titan-17, titan-18, titan-19]}
+                values:
+                  - titan-06
       preferredDuringSchedulingIgnoredDuringExecution:
         - weight: 100
           preference:
@@ -54,9 +50,8 @@ spec:
         - "--host=tcp://0.0.0.0:2375"
         - "--tls=false"
       volumeMounts:
-        - name: workspace-volume
+        - name: dind-storage
           mountPath: /var/lib/docker
-          subPath: .cache/docker
         - name: workspace-volume
           mountPath: /home/jenkins/agent
     - name: builder
@@ -95,20 +90,20 @@ spec:
   volumes:
     - name: docker-config-writable
       emptyDir: {}
+    - name: dind-storage
+      emptyDir: {}
     - name: harbor-config
       secret:
         secretName: harbor-robot-pipeline
         items:
           - key: .dockerconfigjson
             path: config.json
+    - name: workspace-volume
+      emptyDir: {}
 """
     }
   }
   environment {
-    PIP_CACHE_DIR = '/home/jenkins/agent/.cache/pip'
-    NPM_CONFIG_CACHE = '/home/jenkins/agent/.cache/npm'
-    SONAR_USER_HOME = '/home/jenkins/agent/.cache/sonar'
-    TMPDIR = '/home/jenkins/agent/.cache/tmp'
     PIP_DISABLE_PIP_VERSION_CHECK = '1'
     PYTHONUNBUFFERED = '1'
     SUITE_NAME = 'atlasbot'
@@ -124,11 +119,6 @@ spec:
     buildDiscarder(logRotator(daysToKeepStr: '30', numToKeepStr: '200', artifactDaysToKeepStr: '30', artifactNumToKeepStr: '120'))
   }
   stages {
-    stage('Prepare build scratch') {
-      steps {
-        sh 'mkdir -p /home/jenkins/agent/.cache/tmp /home/jenkins/agent/.cache/go-tmp'
-      }
-    }
     stage('Checkout') {
       steps {
         checkout scm

atlasbot/matrix/bot.py

@@ -163,11 +163,10 @@ class MatrixBot:
                     note = "thinking"
                 snippet = note[:64]
                 now = time.monotonic()
-                should_send = False
+                should_send = (
-                if snippet and snippet != last_note:
+                    (snippet and snippet != last_note)
-                    should_send = True
+                    or now - last_sent >= max(60.0, self._settings.thinking_interval_sec * 2)
-                elif now - last_sent >= max(60.0, self._settings.thinking_interval_sec * 2):
+                )
-                    should_send = True
                 if should_send:
                     msg = f"Still thinking — {snippet}…"
                     await self._client.send_message(token, room_id, msg)