Merge branch 'main' into infrastructure-failure-detection

Signed-off-by: Andrew Brandt <andrew.brandt@hashgraph.com>

Author: andrewb1269

.github/workflows/050-user-memory-profile-ctrl.yaml

@@ -120,7 +120,7 @@ jobs:
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           distribution: temurin
-          java-version: 21.0.6
+          java-version: 25
 
       - name: Install tools
         run: |

.github/workflows/210-flow-merge-queue-controller.yaml

@@ -13,12 +13,29 @@ permissions:
   pull-requests: write
   statuses: write
   checks: write
-  contents: read
+  contents: write
 
 jobs:
+  # Trigger the MATS Tests
+  trigger-mats-tests:
+    name: MQ MATS
+    uses: ./.github/workflows/zxc-mats-tests.yaml
+    with:
+      ref: ${{ github.ref }}
+      enable-snyk-scan: "true" # for Snyk
+      enable-gradle-determinism: "true"
+      enable-docker-determinism: "true"
+    secrets:
+      access-token: ${{ secrets.GITHUB_TOKEN }}
+      codacy-project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+      codecov-token: ${{ secrets.CODECOV_TOKEN }}
+      gradle-cache-username: ${{ secrets.GRADLE_CACHE_USERNAME }}
+      gradle-cache-password: ${{ secrets.GRADLE_CACHE_PASSWORD }}
+      snyk-token: ${{ secrets.SNYK_TOKEN }}
+
   # Trigger the MQ XTS Tests
   trigger-merge-queue-xts-tests:
-    name: Merge Queue XTS Required Tests
+    name: MQ XTS
     uses: ./.github/workflows/zxc-xts-tests.yaml
     with:
       ref: ${{ github.ref }}
@@ -50,44 +67,19 @@ jobs:
       slack-tck-report-webhook: ${{ secrets.SLACK_TCK_MONITOR_WEBHOOK }}
 
   # Trigger the MQ Performance/Longevity Tests
-  #  trigger-merge-queue-performance-longevity-tests:
-  #    name: Merge Queue Performance/Longevity Tests
-  #    uses: ./.github/workflows/zxc-performance-tests.yaml
-  #    Ensure we use ${{ vars.MQPT_CLUSTER }} to determine which cluster to run the tests on
-
-  # Update the variable `MQPT_CLUSTER` in Github
-  # Options are: Dallas_n10, Dallas_n11, Dallas_n12
-  # This job will be removed before Merge Queues are required
-  # This job is ONLY for testing purposes to rapidly iterate and test
-  update-mqpt-cluster-variable:
-    name: Update MQPT_CLUSTER Variable
-    runs-on: hl-cn-default-lin-sm
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
-        with:
-          egress-policy: audit
-
-      - name: Calculate Next Dallas Cluster Name
-        run: |
-          current_cluster="${{ vars.MQPT_CLUSTER }}"
-          if [[ "${current_cluster}" == "Dallas_n10" ]]; then
-              next_cluster="Dallas_n11"
-          elif [[ "${current_cluster}" == "Dallas_n11" ]]; then
-              next_cluster="Dallas_n12"
-          elif [[ "${current_cluster}" == "Dallas_n12" ]]; then
-              next_cluster="Dallas_n10"
-          else
-              echo "Error: Invalid cluster name '${current_cluster}'. Expected 'Dallas_n10', 'Dallas_n11', or 'Dallas_n12'."
-              exit 1
-          fi
-          echo "Next cluster: ${next_cluster}"
-          echo "NEXT_CLUSTER=$next_cluster" >> "${GITHUB_ENV}"
-
-      - name: Update MQPT_CLUSTER to input value
-        uses: mmoyaferrer/set-github-variable@31e0d07964802728d7bf8e09dc45b86ee2c8d5f8 # v1.0.0
-        with:
-          name: "MQPT_CLUSTER"
-          value: "${{ env.NEXT_CLUSTER }}"
-          repository: ${{ github.repository }}
-          token: ${{ secrets.GH_ACCESS_TOKEN }}
+  trigger-merge-queue-performance-tests:
+    name: MQPT
+    uses: ./.github/workflows/zxc-merge-queue-performance-test.yaml
+    with:
+      test-asset: "${{ vars.MQPT_CLUSTER }}"
+      ref: "${{ github.ref }}"
+      solo-version: "${{ vars.CITR_SOLO_VERSION }}"
+      nlg-accounts: "20000000"
+      nlg-time: "60"
+      add-app-props: ""
+      add-settings: ""
+      run_NLGDparams: "-Dbenchmark.stepDuration=20m -Dbenchmark.coolDown=3m"
+      delete-namespace: true
+    secrets:
+      slack-report-webhook: ${{ secrets.SLACK_CITR_DETAILED_REPORTS_WEBHOOK }}
+      rootly-api-token: ${{ secrets.ROOTLY_API_TOKEN }}

.github/workflows/docs/citr-test-config.md

@@ -17,7 +17,7 @@ on:
         description: "Java JDK Version:"
         type: string
         required: false
-        default: "21.0.6"
+        default: "25"
 
 defaults:
   run:
@@ -57,7 +57,7 @@ jobs:
     with:
       ref: ${{ needs.commit-info.outputs.sha }}
       java-distribution: ${{ inputs.java-distribution || 'temurin' }}
-      java-version: ${{ inputs.java-version || '21.0.6' }}
+      java-version: ${{ inputs.java-version || '25' }}
     secrets:
       gradle-cache-username: ${{ secrets.GRADLE_CACHE_USERNAME }}
       gradle-cache-password: ${{ secrets.GRADLE_CACHE_PASSWORD }}
@@ -70,7 +70,7 @@ jobs:
     with:
       ref: ${{ needs.commit-info.outputs.sha }}
       java-distribution: ${{ inputs.java-distribution || 'temurin' }}
-      java-version: ${{ inputs.java-version || '21.0.6' }}
+      java-version: ${{ inputs.java-version || '25' }}
     secrets:
       github-token: ${{ secrets.GITHUB_TOKEN }}
       gradle-cache-username: ${{ secrets.GRADLE_CACHE_USERNAME }}

.github/workflows/flow-artifact-determinism.yaml

@@ -83,11 +83,16 @@ jobs:
       enable-hapi-tests: "${{ inputs.enable-hapi-tests || 'false' }}"
       enable-hapi-tests-crypto: "${{ inputs.enable-hapi-tests || 'false' }}"
       enable-hapi-tests-token: "${{ inputs.enable-hapi-tests || 'false' }}"
+      enable-hapi-tests-time-consuming: "${{ inputs.enable-hapi-tests || 'false' }}"
+      enable-hapi-tests-state-throttling: "${{ inputs.enable-hapi-tests || 'false' }}"
+      enable-hapi-tests-simplefees: "${{ inputs.enable-hapi-tests || 'false' }}"
+      enable-hapi-tests-atomic-batch: "${{ inputs.enable-hapi-tests || 'false' }}"
+      enable-hapi-tests-smart-contract: "${{ inputs.enable-hapi-tests || 'false' }}"
       enable-otter-tests: "${{ inputs.enable-otter-tests || 'false' }}"
       enable-snyk-scan: "${{ inputs.enable-snyk-scan || 'false' }}"
       enable-gradle-determinism: "${{ inputs.enable-gradle-determinism || 'false' }}"
       enable-docker-determinism: "${{ inputs.enable-docker-determinism || 'false' }}"
-      java-version: "21.0.6"
+      java-version: "25"
       java-distribution: "temurin"
       custom-job-label: "${{ inputs.custom-job-label || 'MATS (dry-run):' }}"
     secrets:

.github/workflows/flow-dry-run-mats-suite.yaml

@@ -42,7 +42,7 @@ jobs:
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           distribution: "temurin"
-          java-version: "21.0.4"
+          java-version: "25"
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

.github/workflows/flow-increment-next-main-release.yaml

@@ -28,14 +28,19 @@ jobs:
       enable-dependency-check: "true"
       enable-unit-tests: "true"
       enable-integration-tests: "true"
+      # general hapi tests include misc, misc records, iss, smart contract, restart, nd reconnect, atomic batch
       enable-hapi-tests: "true"
       enable-hapi-tests-crypto: "true"
       enable-hapi-tests-token: "true"
+      enable-hapi-tests-time-consuming: "true"
+      enable-hapi-tests-state-throttling: "true"
+      enable-hapi-tests-simplefees: "true"
+      enable-hapi-tests-smart-contract: "true"
       enable-otter-tests: "true"
       enable-snyk-scan: "true"
       enable-gradle-determinism: "true"
       enable-docker-determinism: "true"
-      java-version: "21.0.6"
+      java-version: "25"
       java-distribution: "temurin"
       custom-job-label: "MATS (main):"
     secrets:
@@ -58,12 +63,30 @@ jobs:
         with:
           egress-policy: audit
 
+      - name: Checkout Code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: "0"
+
+      - name: Resolve Workflow Reference
+        id: resolve-ref
+        run: |
+          RESOLVED_REF=${{ github.ref_name }}
+
+          if ! git ls-remote --exit-code origin "${RESOLVED_REF}" &>/dev/null; then
+            echo "::warning::Reference ${RESOLVED_REF} not found in remote. Defaulting to 'main'."
+            RESOLVED_REF="main"
+          fi
+
+          echo "Using workflow reference: ${RESOLVED_REF}"
+          echo "workflow-ref=${RESOLVED_REF}" >> "${GITHUB_OUTPUT}"
+
       - name: Trigger ZXF Deploy Production Release
         uses: step-security/workflow-dispatch@b4c1dc0afa074d0b4f0e653d3b80d4b2798599aa # v1.2.7
         with:
           workflow: .github/workflows/node-flow-deploy-release-artifact.yaml
           repo: hiero-ledger/hiero-consensus-node # ensure we are executing in the hiero-ledger org
-          ref: main # ensure we are always using the workflow definition from the main branch
+          ref: ${{ steps.resolve-ref.outputs.workflow-ref }} # ensure we are always using the correct workflow definition. Default to main.
           token: ${{ secrets.GH_ACCESS_TOKEN }}
           inputs: '{
             "ref": "${{ github.sha }}",
@@ -435,10 +458,10 @@ jobs:
           SLACKEOF
 
       # Notification routing:
-      #   test failures       -> citr-operations (detailed) + release-team (detailed)
-      #   infrastructure      -> citr-failures (detailed) + release-team (summary) + citr-operations (summary)
-      #   canceled            -> release-team (summary) + citr-operations (summary) + citr-failures (summary)
-      - name: Notify test failure (citr-operations)
+      #   test failures       -> citr-operations (detailed)
+      #   infrastructure      -> citr-operations (summary) + citr-failures (detailed)
+      #   canceled            -> citr-operations (summary) + citr-failures (summary)
+      - name: Notify test failure detailed (citr-operations)
         if: ${{ steps.report-category.outputs.category == 'test' }}
         uses: slackapi/slack-github-action@b0fa283ad8fea605de13dc3f449259339835fc52 # v2.1.0
         with:
@@ -447,23 +470,23 @@ jobs:
           payload-templated: true
           payload-file-path: slack_payload.json
 
-      - name: Notify infrastructure failure (citr-failures)
+      - name: Notify infrastructure failure summary (citr-operations)
         if: ${{ steps.report-category.outputs.category == 'infrastructure' }}
         uses: slackapi/slack-github-action@b0fa283ad8fea605de13dc3f449259339835fc52 # v2.1.0
         with:
-          webhook: ${{ secrets.SLACK_CITR_FAILURES_WEBHOOK }}
+          webhook: ${{ secrets.SLACK_CITR_OPERATIONS_WEBHOOK }}
           webhook-type: incoming-webhook
           payload-templated: true
-          payload-file-path: slack_payload.json
+          payload-file-path: slack_payload_summary.json
 
-      - name: Notify infrastructure failure summary (citr-operations)
+      - name: Notify infrastructure failure detailed (citr-failures)
         if: ${{ steps.report-category.outputs.category == 'infrastructure' }}
         uses: slackapi/slack-github-action@b0fa283ad8fea605de13dc3f449259339835fc52 # v2.1.0
         with:
-          webhook: ${{ secrets.SLACK_CITR_OPERATIONS_WEBHOOK }}
+          webhook: ${{ secrets.SLACK_CITR_FAILURES_WEBHOOK }}
           webhook-type: incoming-webhook
           payload-templated: true
-          payload-file-path: slack_payload_summary.json
+          payload-file-path: slack_payload.json
 
       - name: Notify cancelled summary (citr-operations)
         if: ${{ steps.report-category.outputs.category == 'cancelled' }}

.github/workflows/node-flow-build-application.yaml

@@ -18,7 +18,7 @@ on:
         description: "Java JDK Version:"
         type: string
         required: false
-        default: "21.0.6"
+        default: "25"
       java-distribution:
         description: "Java JDK Distribution:"
         type: string
@@ -44,7 +44,7 @@ jobs:
       trigger-env-deploy: none
       release-profile: AdhocCommit
       dry-run-enabled: ${{ github.event.inputs.dry-run-enabled == 'true' }}
-      java-version: ${{ github.event.inputs.java-version || '21.0.6' }}
+      java-version: ${{ github.event.inputs.java-version || '25' }}
       java-distribution: ${{ github.event.inputs.java-distribution || 'temurin' }}
       gradle-version: ${{ github.event.inputs.gradle-version || 'wrapper' }}
       ref: ${{ github.event.inputs.ref }}
@@ -62,7 +62,7 @@ jobs:
       sdk-ossrh-password: ${{ secrets.PLATFORM_OSSRH_PASSWORD }}
       sdk-gpg-key-contents: ${{ secrets.PLATFORM_GPG_KEY_CONTENTS }}
       sdk-gpg-key-passphrase: ${{ secrets.PLATFORM_GPG_KEY_PASSPHRASE }}
-      slack-webhook-url: ${{ secrets.PLATFORM_SLACK_RELEASE_WEBHOOK }}
+      slack-webhook-url: ${{ secrets.SLACK_CITR_BUILD_PROMOTION_WEBHOOK }}
       jf-url: ${{ vars.JF_URL }}
       jf-docker-registry: ${{ vars.JF_DOCKER_REGISTRY }}
       jf-user-name: ${{ vars.JF_USER_NAME }}

.github/workflows/node-flow-deploy-adhoc-artifact.yaml

@@ -91,7 +91,7 @@ jobs:
       sdk-ossrh-password: ${{ secrets.PLATFORM_OSSRH_PASSWORD }}
       sdk-gpg-key-contents: ${{ secrets.PLATFORM_GPG_KEY_CONTENTS }}
       sdk-gpg-key-passphrase: ${{ secrets.PLATFORM_GPG_KEY_PASSPHRASE }}
-      slack-webhook-url: ${{ secrets.PLATFORM_SLACK_RELEASE_WEBHOOK }}
+      slack-webhook-url: ${{ secrets.SLACK_CITR_BUILD_PROMOTION_WEBHOOK }}
       jf-url: ${{ vars.JF_URL }}
       jf-docker-registry: ${{ vars.JF_DOCKER_REGISTRY }}
       jf-user-name: ${{ vars.JF_USER_NAME }}
@@ -177,7 +177,7 @@ jobs:
       sdk-ossrh-password: ${{ secrets.PLATFORM_OSSRH_PASSWORD }}
       sdk-gpg-key-contents: ${{ secrets.PLATFORM_GPG_KEY_CONTENTS }}
       sdk-gpg-key-passphrase: ${{ secrets.PLATFORM_GPG_KEY_PASSPHRASE }}
-      slack-webhook-url: ${{ secrets.PLATFORM_SLACK_RELEASE_WEBHOOK }}
+      slack-webhook-url: ${{ secrets.SLACK_CITR_BUILD_PROMOTION_WEBHOOK }}
       jf-url: ${{ vars.JF_URL }}
       jf-docker-registry: ${{ vars.JF_DOCKER_REGISTRY }}
       jf-user-name: ${{ vars.JF_USER_NAME }}
@@ -489,11 +489,3 @@ jobs:
           webhook-type: incoming-webhook
           payload-templated: true
           payload-file-path: slack_payload.json
-
-      - name: Report failure (slack release-team)
-        uses: slackapi/slack-github-action@b0fa283ad8fea605de13dc3f449259339835fc52 # v2.1.0
-        with:
-          webhook: ${{ secrets.SLACK_RELEASE_TEAM_WEBHOOK }}
-          webhook-type: incoming-webhook
-          payload-templated: true
-          payload-file-path: slack_payload.json