Merge branch 'main' into docs_groups-config-page

Author: PaulRMellor

.github/actions/systemtests/verify-workflow-run-succeeded.sh

@@ -8,20 +8,36 @@ source $SCRIPT_DIR/common.sh
 
 WORKFLOW_FILE=${1:-integration.yml}
 
-echo "Check workflow run succeeded"
+echo "Check build-images job succeeded"
 
 # Get branch from PR
 BRANCH=$(gh pr view "$PR_NUMBER" --repo "$REPO" --json headRefName -q '.headRefName')
 echo "Fetching latest Build workflow run for branch $BRANCH..."
 
-# Fetch latest workflow run conclusion
-BUILD_RUN=$(gh api "repos/$REPO/actions/workflows/$WORKFLOW_FILE/runs?branch=$BRANCH&per_page=1" \
-  --jq '.workflow_runs[0].conclusion')
+# Get the latest run ID for the workflow
+RUN_ID=$(gh api "repos/$REPO/actions/workflows/$WORKFLOW_FILE/runs?branch=$BRANCH&per_page=1" \
+  --jq '.workflow_runs[0].id')
 
-echo "Build workflow latest run conclusion: $BUILD_RUN"
-if [[ "$BUILD_RUN" != "success" ]]; then
-  # Comment workflow status
+echo "Latest workflow run ID: $RUN_ID"
+
+if [[ -z "$RUN_ID" || "$RUN_ID" == "null" ]]; then
+  deleteLastStatusComment
+  gh pr comment $PR_NUMBER --repo $REPO --body "❌ No workflow run found for branch $BRANCH. Cannot trigger systemtests"
+  exit 1
+fi
+
+# Check specifically the build-images job conclusion within that run
+BUILD_IMAGES_STATUS=$(gh api "repos/$REPO/actions/runs/$RUN_ID/jobs" \
+  --jq '.jobs[] | select(.name=="build-images") | .conclusion')
+
+echo "build-images job conclusion: $BUILD_IMAGES_STATUS"
+
+if [[ "$BUILD_IMAGES_STATUS" != "success" ]]; then
   deleteLastStatusComment
-  gh pr comment $PR_NUMBER --repo $REPO --body "❌ Build did not succeed. Cannot trigger systemtests"
+  gh pr comment $PR_NUMBER --repo $REPO --body "❌ build-images job did not succeed (status: $BUILD_IMAGES_STATUS). Cannot trigger systemtests"
   exit 1
 fi
+
+# Export run ID so systemtests workflow can download artifacts from it directly
+echo "ARTIFACTS_RUN_ID=$RUN_ID" >> $GITHUB_ENV
+echo "Build images succeeded, artifacts available from run $RUN_ID"

.github/dependabot.yml

@@ -37,6 +37,9 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  ignore:
+    - dependency-name: "storybook"
+    - dependency-name: "@storybook/*"
   groups:
     patternfly:
       patterns:

.github/workflows/pre-systemtest.yml

@@ -30,7 +30,7 @@ jobs:
         if: ${{ contains(github.event.comment.body, '--help') }}
         run: ./.github/actions/systemtests/pr-help.sh
 
-      - name: Check if Build workflow succeeded
+      - name: Check if build-images job succeeded
         run: ./.github/actions/systemtests/verify-workflow-run-succeeded.sh
 
       - name: Parse parameters from comment
@@ -40,14 +40,15 @@ jobs:
       - name: Comment start of the build
         run: ./.github/actions/systemtests/update-pr-systemtests-started.sh
 
-      - name: Invoke workflow in another repo with inputs
+      - name: Invoke workflow with inputs
         uses: benc-uk/workflow-dispatch@7a027648b88c2413826b6ddd6c76114894dc5ec4
         with:
           token: ${{ secrets.BOT_ORG_SCOPED_TOKEN }}
           workflow: systemtests.yml
           inputs: >
             {
               "commit_sha": "${{ env.COMMIT_SHA }}",
+              "artifacts_run_id": "${{ env.ARTIFACTS_RUN_ID }}",
               "testcase": "${{ env.TESTCASE }}",
               "profile": "${{ env.PROFILE }}",
               "install_type": "${{ env.INSTALL_TYPE }}",

.github/workflows/systemtests.yml

@@ -6,6 +6,9 @@ on:
       commit_sha:
         description: 'Commit sha'
         required: true
+      artifacts_run_id:
+        description: 'Run ID of the integration workflow to download artifacts from'
+        required: true
       testcase:
         description: 'Test case to run'
         required: false
@@ -65,6 +68,7 @@ jobs:
       TEST_CASE: ${{ matrix.testcase }}
       PROFILE: ${{ matrix.profile }}
       COMMIT_SHA: ${{ github.event.inputs.commit_sha }}
+      ARTIFACTS_RUN_ID: ${{ github.event.inputs.artifacts_run_id }}
       GH_TOKEN: ${{ secrets.BOT_ORG_SCOPED_TOKEN }}
       REPO: ${{ github.repository }}
       INSTALL_TYPE: ${{ github.event.inputs.install_type }}
@@ -80,11 +84,6 @@ jobs:
         with:
           ref: ${{ env.COMMIT_SHA }}
 
-      - name: Get previously built artifacts
-        run: |
-          ARTIFACTS_RUN_ID=$(gh run list --repo $REPO --commit $COMMIT_SHA --workflow integration.yml --status success --json databaseId --jq '.[0].databaseId')
-          echo "ARTIFACTS_RUN_ID=$ARTIFACTS_RUN_ID" >> $GITHUB_ENV
-
       - name: Download Image Artifacts
         uses: actions/download-artifact@v8
         with:
@@ -113,17 +112,14 @@ jobs:
           echo "PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
           echo "CONSOLE_CLUSTER_DOMAIN=$(minikube ip).nip.io" >> $GITHUB_ENV
 
-      # YAML INSTALL PATH
       - name: Prepare YAML install
         if: ${{ env.INSTALL_TYPE == 'yaml' }}
         run: |
           set -x
           echo "Preparing YAML-based installation..."
 
-          # Download k8s-resources artifact (same run as images)
-          gh run download ${{ env.ARTIFACTS_RUN_ID }} --repo ${{ env.REPO }}  -n k8s-resources --dir ./k8s-resources
+          gh run download ${{ env.ARTIFACTS_RUN_ID }} --repo ${{ env.REPO }} -n k8s-resources --dir ./k8s-resources
 
-          # Merge YAML files
           mkdir -p ./k8s-resources/merged
           cat ./k8s-resources/kubernetes/consoles.console.streamshub.github.com-v1.yml \
               ./k8s-resources/kubernetes/kubernetes.yml \

api/src/main/docker/Dockerfile

@@ -53,7 +53,7 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi9/openjdk-21:1.24-2.1772091453
+FROM registry.access.redhat.com/ubi9/openjdk-21:1.24-2.1773186566
 
 ENV LANGUAGE='en_US:en'
 LABEL org.opencontainers.image.source="https://github.com/streamshub/console"

operator/src/main/docker/Dockerfile

@@ -53,7 +53,7 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi9/openjdk-21:1.24-2.1772091453
+FROM registry.access.redhat.com/ubi9/openjdk-21:1.24-2.1773186566
 
 ENV LANGUAGE='en_US:en'
 LABEL org.opencontainers.image.source="https://github.com/streamshub/console"

systemtests/config.yaml

@@ -4,6 +4,8 @@
 # -------------------------------------------
 # Cleanup environment after test. In case of debugging, this env lets you skip afterEach and afterAll.
 CLEANUP_ENVIRONMENT: true
+# This allows re-deployment of console operator if it already exists
+DELETE_CONSOLE_OPERATOR_BEFORE_INSTALL: true
 # Log level used in file output
 TEST_FILE_LOG_LEVEL: DEBUG
 # Log level used in console output
@@ -41,12 +43,12 @@ CONSOLE_OLM_CHANNEL_NAME: alpha
 # YAML
 # -------------------------------------------
 # Which released version of Strimzi Cluster Operator to install
-STRIMZI_OPERATOR_VERSION: 0.49.0
+STRIMZI_OPERATOR_VERSION: 0.51.0
 # URL or local path for Console Operator installation
 # 1. URL - released console-operator.yaml
 # 2. Local path that is relative to the root project dir
 # 3. Local path that is absolute
-CONSOLE_OPERATOR_BUNDLE_URL: https://github.com/streamshub/console/releases/download/0.8.4/streamshub-console-operator.yaml
+CONSOLE_OPERATOR_BUNDLE_URL: https://github.com/streamshub/console/releases/download/0.11.0/streamshub-console-operator.yaml
 # Custom Console Operator image. Overrides default image used in bundle yaml
 CONSOLE_OPERATOR_IMAGE:
 # -------------------------------------------
@@ -57,9 +59,30 @@ CONSOLE_API_IMAGE:
 # Custom Console UI image. Overrides default image installed automatically by Operator
 CONSOLE_UI_IMAGE:
 # -------------------------------------------
+# Kroxy
+# -------------------------------------------
+# Kroxy released yaml manifests version
+KROXYLICIOUS_VERSION: 0.18.0
+# -------------------------------------------
+# Apicurio
+# -------------------------------------------
+# Apicurio schema registry version
+APICURIO_VERSION: 3.1.7
+# -------------------------------------------
+# Keycloak
+# -------------------------------------------
+# Keycloak released yaml manifest tag version
+KEYCLOAK_VERSION: 26.4.0
+# -------------------------------------------
+# Prometheus
+# -------------------------------------------
+# Used for custom prometheus tests
+# version of the released yaml manifests
+PROMETHEUS_VERSION: 0.89.0
+# -------------------------------------------
 # Kafka
 # -------------------------------------------
 # Kafka version used in system tests
-ST_KAFKA_VERSION: 4.1.0
+ST_KAFKA_VERSION: 4.2.0
 # Image for test client containers in system tests
-TEST_CLIENTS_IMAGE: quay.io/strimzi-test-clients/test-clients:0.12.0-kafka-4.1.0
+TEST_CLIENTS_IMAGE: quay.io/strimzi-test-clients/test-clients:0.13.0-kafka-4.2.0

systemtests/pom.xml

@@ -258,6 +258,14 @@
             </activation>
         </profile>
 
+        <profile>
+            <id>all</id>
+            <properties>
+                <skipTests>false</skipTests>
+                <groups>regression, olm-upgrade, yaml-upgrade</groups>
+            </properties>
+        </profile>
+
         <profile>
             <id>regression</id>
             <properties>

systemtests/src/main/java/com/github/streamshub/systemtests/Environment.java

@@ -27,12 +27,12 @@ public class Environment {
     // Console
     public static final String CONSOLE_API_IMAGE = ENVS.getOrDefault("CONSOLE_API_IMAGE", "");
     public static final String CONSOLE_UI_IMAGE = ENVS.getOrDefault("CONSOLE_UI_IMAGE", "");
-    public static final String CONSOLE_OPERATOR_IMAGE = ENVS.getOrDefault("CONSOLE_OPERATOR_IMAGE", "");
     public static final InstallType CONSOLE_INSTALL_TYPE = ENVS.getOrDefault("CONSOLE_INSTALL_TYPE", InstallType::fromString, InstallType.Yaml);
     public static final String CONSOLE_DEPLOYMENT_NAME = ENVS.getOrDefault("CONSOLE_DEPLOYMENT_NAME", "streamshub-console");
     public static final String CONSOLE_CLUSTER_DOMAIN = ENVS.getOrDefault("CONSOLE_CLUSTER_DOMAIN", "");
+    public static final boolean DELETE_CONSOLE_OPERATOR_BEFORE_INSTALL = ENVS.getOrDefault("DELETE_CONSOLE_OPERATOR_BEFORE_INSTALL", Boolean::parseBoolean, true);
 
-     // YAML bundle
+    // YAML bundle
     public static final String CONSOLE_OPERATOR_BUNDLE_URL = ENVS.getOrDefault("CONSOLE_OPERATOR_BUNDLE_URL", "");
 
     // OLM
@@ -66,20 +66,25 @@ public class Environment {
     public static final String TEST_CLIENTS_PULL_SECRET = ENVS.getOrDefault("TEST_CLIENTS_PULL_SECRET", "");
 
     // Keycloak
-    public static final String KEYCLOAK_VERSION = ENVS.getOrDefault("KEYCLOAK_VERSION", "26.2.5");
+    public static final String KEYCLOAK_VERSION = ENVS.getOrDefault("KEYCLOAK_VERSION", "26.4.0");
     public static final boolean DEFAULT_TO_DENY_NETWORK_POLICIES = ENVS.getOrDefault("DEFAULT_TO_DENY_NETWORK_POLICIES", Boolean::parseBoolean, true);
     public static final String KEYCLOAK_TRUST_STORE_FILE_PATH = ENVS.getOrDefault("TRUST_STORE_FILE_PATH", "/tmp/keycloak/keycloak-truststore.jks");
+    // For custom keycloak images
+    public static final String KEYCLOAK_OPERATOR_IMAGE = ENVS.getOrDefault("KEYCLOAK_OPERATOR_IMAGE", "");
+    public static final String KEYCLOAK_SERVER_IMAGE = ENVS.getOrDefault("KEYCLOAK_SERVER_IMAGE", "");
 
     // Postgres
     public static final String POSTGRES_IMAGE = ENVS.getOrDefault("POSTGRES_IMAGE", "mirror.gcr.io/postgres:18");
 
     // Proxy
     public static final String KROXYLICIOUS_VERSION = ENVS.getOrDefault("KROXYLICIOUS_VERSION", "0.18.0");
 
-
     // Apicurio
     public static final String APICURIO_VERSION = ENVS.getOrDefault("APICURIO_VERSION", "3.1.7");
 
+    // Prometheus
+    public static final String PROMETHEUS_VERSION = ENVS.getOrDefault("PROMETHEUS_VERSION", "0.89.0");
+
     // ------------------------------------------------------------------------------------------------------------------------------------------------------------
     // Deny instantiation
     private Environment() {}

systemtests/src/main/java/com/github/streamshub/systemtests/MessageStore.java

@@ -58,6 +58,9 @@ private MessageStore() {}
     static final String BRAND = "brand";
     static final String RECONCILIATION = "reconciliation";
     static final String MESSAGE_BROWSER = "message-browser";
+    static final String APP_LAYOUT = "AppLayout";
+    static final String KAFKA_CONNECT = "KafkaConnect";
+    static final String GROUPS_TABLE = "GroupsTable";
 
     public static String getProductName() {
         return jsonResources.get(COMMON).get(PRODUCT).textValue();
@@ -95,9 +98,6 @@ public static String reconciliationCancel() {
         return jsonResources.get(RECONCILIATION).get("cancel").textValue();
     }
 
-    public static String reconciliationResume() {
-        return jsonResources.get(RECONCILIATION).get("resume").textValue();
-    }
 
     public static String reconciliationPausedWarning() {
         return jsonResources.get(RECONCILIATION).get("reconciliation_paused_warning").textValue();
@@ -114,9 +114,17 @@ public static String clusterCardNoMessages() {
     public static String noDataTitle() {
         return jsonResources.get(MESSAGE_BROWSER).get("no_data_title").textValue();
     }
-    public static String noDataBody() {
-        return jsonResources.get(MESSAGE_BROWSER).get("no_data_title").textValue();
+
+    public static String noConsumerGroups() {
+        return jsonResources.get(GROUPS_TABLE).get("no_consumer_groups").textValue();
     }
 
+    public static String groupsTitle() {
+        return jsonResources.get(GROUPS_TABLE).get("title").textValue();
+    }
+
+    public static String kafkaConnect() {
+        return jsonResources.get(APP_LAYOUT).get("kafka_connect").textValue();
+    }
 
 }