Preparing 26.1.x release branch

Signed-off-by: Alexander Schwartz <[email protected]>
keycloak · Jan 28, 2025 · 362e1bc · 362e1bc
1 parent c81b221
commit 362e1bc
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -62,7 +62,7 @@ jobs:
           gh release create ${{ steps.get_version.outputs.VERSION }}
           --target ${{ github.ref }}
           --title 'Keycloak Benchmark ${{ steps.get_version.outputs.VERSION }}'
-          --notes 'Latest version built from the `${{ github.ref_name }}` branch.'
+          --notes 'Latest version built from the `${{ github.ref_name }}` branch. <br>Use this with Keycloak 26.1.x'
           --prerelease
           ./dataset/target/keycloak-benchmark-dataset-${{ steps.get_version.outputs.VERSION }}.jar
           ./benchmark/target/keycloak-benchmark-${{ steps.get_version.outputs.VERSION }}.zip

diff --git a/ansible/env_example.yml b/ansible/env_example.yml
@@ -11,6 +11,6 @@ instance_volume_size: 30
 # kcb_version: 0.9-SNAPSHOT
 
 # This will use a locally built version
-kcb_zip: ../benchmark/target/keycloak-benchmark-0.15-SNAPSHOT.zip
+kcb_zip: ../benchmark/target/keycloak-benchmark-26.1-SNAPSHOT.zip
 
 kcb_heap_size: 1G
diff --git a/ansible/env_rosa_benchmark.yml b/ansible/env_rosa_benchmark.yml
@@ -1,5 +1,5 @@
 # Setting use for ROSA default benchmark
 cluster_size: 5
-kcb_zip: ../benchmark/target/keycloak-benchmark-0.15-SNAPSHOT.zip
+kcb_zip: ../benchmark/target/keycloak-benchmark-26.1-SNAPSHOT.zip
 # GitHub actions seem to use different IP addresses for a single runner, which would then be rejected
 cidr_ip: '0.0.0.0/0'
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.keycloak.benchmark</groupId>
     <artifactId>keycloak-benchmark</artifactId>
-    <version>0.15-SNAPSHOT</version>
+    <version>26.1-SNAPSHOT</version>
 
     <properties>
         <scala.version>2.13.14</scala.version>

diff --git a/dataset/pom.xml b/dataset/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-benchmark-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>0.15-SNAPSHOT</version>
+        <version>26.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/dataset/src/test/java/org/keycloak/benchmark/test/KeycloakServer.java b/dataset/src/test/java/org/keycloak/benchmark/test/KeycloakServer.java
@@ -28,7 +28,7 @@
 public class KeycloakServer {
 
     private static final String KEYCLOAK_VERSION = System.getProperty("keycloak.version", "999.0.0-SNAPSHOT");
-    private static final String PROJECT_VERSION = System.getProperty("project.version", "0.15-SNAPSHOT");
+    private static final String PROJECT_VERSION = System.getProperty("project.version", "26.1-SNAPSHOT");
 
     public static void main(String[] rawArgs) {
         List<String> args = new ArrayList<>(Arrays.asList(rawArgs));

diff --git a/doc/benchmark/antora.yml b/doc/benchmark/antora.yml
@@ -1,5 +1,5 @@
 title: Benchmark Guide
 name: benchmark-guide
-version: '0.15'
+version: '26.1'
 nav:
   - modules/ROOT/nav.adoc
diff --git a/doc/benchmark/modules/ROOT/pages/report/rosa-benchmark-key-results.adoc b/doc/benchmark/modules/ROOT/pages/report/rosa-benchmark-key-results.adoc
@@ -75,7 +75,7 @@ See xref:run/running-benchmark-ansible.adoc[] for details.
 cluster_size: 5
 instance_type: t4g.small
 instance_volume_size: 30
-kcb_zip: ../benchmark/target/keycloak-benchmark-0.15-SNAPSHOT.zip
+kcb_zip: ../benchmark/target/keycloak-benchmark-26.1-SNAPSHOT.zip
 kcb_heap_size: 1G
 ----
 

diff --git a/doc/benchmark/modules/ROOT/pages/run/running-benchmark-ansible.adoc b/doc/benchmark/modules/ROOT/pages/run/running-benchmark-ansible.adoc
@@ -122,7 +122,7 @@ Use the file `link:{github-files}/ansible/env_example.yml[env_example.yaml]` as
 .Example contents to configure the benchmark execution via `env.yml`
 [source,yaml]
 ----
-kcb_zip: ../benchmark/target/keycloak-benchmark-0.15-SNAPSHOT.zip
+kcb_zip: ../benchmark/target/keycloak-benchmark-26.1-SNAPSHOT.zip
 kcb_heap_size: 1G
 ----
 

diff --git a/doc/dataset/antora.yml b/doc/dataset/antora.yml
@@ -1,6 +1,6 @@
 title: Dataset Guide
 name: dataset-guide
-version: '0.15'
+version: '26.1'
 nav:
   - modules/ROOT/nav.adoc
 
diff --git a/doc/kubernetes/antora.yml b/doc/kubernetes/antora.yml
@@ -1,6 +1,6 @@
 title: Kubernetes Guide
 name: kubernetes-guide
-version: '0.15'
+version: '26.1'
 nav:
   - modules/ROOT/nav.adoc
 ext:

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.keycloak</groupId>
   <artifactId>keycloak-benchmark-parent</artifactId>
-  <version>0.15-SNAPSHOT</version>
+  <version>26.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Keycloak Benchmark Parent</name>

diff --git a/provision/common/Taskfile.yaml b/provision/common/Taskfile.yaml
@@ -9,7 +9,7 @@ vars:
   KC_DB_POOL_MAX_SIZE: '{{default "10" .KC_DB_POOL_MAX_SIZE}}'
   KC_DB_POOL_MIN_SIZE: '{{default "5" .KC_DB_POOL_MIN_SIZE}}'
   KC_DATABASE: '{{default "postgres" .KC_DATABASE}}'
-  KC_OPERATOR_TAG: '{{default "nightly" .KC_OPERATOR_TAG}}'
+  KC_OPERATOR_TAG: '{{default "26.1.0" .KC_OPERATOR_TAG}}'
   KC_CONTAINER_IMAGE: '{{default "" .KC_CONTAINER_IMAGE}}'
   KC_INSTANCES: '{{default "1" .KC_INSTANCES}}'
   KC_CPU_REQUESTS: '{{default "0" .KC_CPU_REQUESTS}}'
@@ -202,7 +202,7 @@ tasks:
       - mkdir -p keycloak-cli
       - rm -f keycloak-cli/*.zip
       - >
-        curl -L -f https://github.com/keycloak/keycloak/releases/download/nightly/keycloak-999.0.0-SNAPSHOT.zip -o keycloak-cli/keycloak.zip
+        curl -L -f https://github.com/keycloak/keycloak/releases/download/26.1.0/keycloak-26.1.0.zip -o keycloak-cli/keycloak.zip
     status:
       - find keycloak-cli/keycloak.zip -mtime +1 -exec false {} +
     sources:

diff --git a/provision/keycloak-tasks/Taskfile.yaml b/provision/keycloak-tasks/Taskfile.yaml
@@ -37,7 +37,7 @@ vars:
   KC_DB_POOL_MAX_SIZE: '{{default "10" .KC_DB_POOL_MAX_SIZE}}'
   KC_DB_POOL_MIN_SIZE: '{{default "5" .KC_DB_POOL_MIN_SIZE}}'
   KC_DATABASE: '{{default "postgres" .KC_DATABASE}}'
-  KC_OPERATOR_TAG: '{{default "nightly" .KC_OPERATOR_TAG}}'
+  KC_OPERATOR_TAG: '{{default "26.1.0" .KC_OPERATOR_TAG}}'
   KC_CONTAINER_IMAGE: '{{default "" .KC_CONTAINER_IMAGE}}'
   KC_INSTANCES: '{{default "1" .KC_INSTANCES}}'
   KC_CPU_REQUESTS: '{{default "0" .KC_CPU_REQUESTS}}'

diff --git a/provision/keycloak-tasks/keycloak-image-helm/templates/keycloak-nightly-imagestream.yaml b/provision/keycloak-tasks/keycloak-image-helm/templates/keycloak-nightly-imagestream.yaml
@@ -11,7 +11,7 @@ spec:
     - name: latest
       from:
         kind: DockerImage
-        name: quay.io/keycloak/keycloak:nightly
+        name: quay.io/keycloak/keycloak:26.1.0
       generation: 2
       importPolicy:
         importMode: PreserveOriginal

diff --git a/provision/rosa-cross-dc/keycloak-benchmark-crossdc-tests/pom.xml b/provision/rosa-cross-dc/keycloak-benchmark-crossdc-tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.keycloak</groupId>
         <artifactId>keycloak-benchmark-parent</artifactId>
-        <version>0.15-SNAPSHOT</version>
+        <version>26.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>