Merge branch 'release-25.10.0' into 'master'

Pedro Velho · Pedro Velho · commit 5c93aecf7071 · 2025-10-23T12:27:13.000Z
Release 25.10.0

See merge request ryax-tech/ryax/ryax-engine!16
diff --git a/.gitmodules b/.gitmodules
@@ -26,10 +26,6 @@
 [submodule "action-wrappers"]
 	path = action-wrappers
 	url = git@gitlab.com:ryax-tech/ryax/ryax-action-wrappers.git
-[submodule "vpa"]
-	path = vpa
-	url = git@gitlab.com:ryax-tech/ryax/ryax-vpa.git
-
 [submodule "errored-actions"]
 	path = errored-actions
 	url = git@gitlab.com:ryax-tech/ryax/errored-actions.git
@@ -53,3 +49,6 @@
 [submodule "hpc-actions"]
 	path = hpc-actions
     url = git@gitlab.com:ryax-tech/workflows/hpc-actions.git
+[submodule "intelliscale"]
+	path = intelliscale
+	url = git@gitlab.com:ryax-tech/ryax/ryax-intelliscale.git
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,27 +1,56 @@
 We are proud to announce the release of:
 
 ​✨​ ​✨​ ​✨​ ​✨​ ​✨​ ​✨​ ​✨​ ​✨​ ​✨​
-# Ryax 25.02.0
+# Ryax 25.10.0
 ​✨​ ​✨​ ​✨​ ​✨​ ​✨​ ​✨​ ​✨​ ​✨​ ​✨​
 
 Optimize the Resources, make Build Simple
 
 ## New features
 
-- Reproducible Action Build with lockfile support
-- Automatic Action resource scaling
-- Automatic Retries
-- Resources accounting (Preview)
+- More robust intelliscale, enhanced detection mechanism
+- Improved monitoring
+- Built-in action resource usage monitoring
+- Track cpu and memory usage per execution
+- Several features to enhance multi objective scheduling
 
 ## Bug fixes and Improvements
 
-- Fix: issue when enabling Action Builder Nix store persistence
-- Fix: enable deletion of workflow even when on error
-- Fix: only use GPU node if asked
-- Fix: state inconsistency in Execution and Deployment in some cases
-- Fix: optional inputs on SSH_SLURM
-- Fix: disable deploy triggers on SSH_SLURM
+- Bug that made worker create queues indefinitely in some situations
+- Fix sudden decomissioning of bitnami repo
+- Prevent builder failure when the wrapper git reference is unavailable
+- Fix builder persitency that was making automatically garbage collection fails
+- Fixed bug that let actions build stuck on starting state
+- Switch to uv for python packaging
+- Upgrade to traefik 3
 
 ## Upgrade to this version
 
-Then apply the update as usual.
+### Before you start
+
+Install CRDs for traefik v3 migration.
+
+```shell
+kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v3.5/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml
+```
+
+First if you have a job on ryaxns named `ryax-studio-scale-down` delete the ryax-studio-scale-down job to avoid imagePullBackOff due the 
+sudden decommissioning of bitnami.
+
+```shell
+kubectl delete job -n ryaxns ryax-studio-scale-down
+```
+
+If your ryax_values.yaml file has an empty `storageClass: """`, remove this entry
+and ensure you have one and only one as default.
+
+### Upgrade
+
+Apply the upgrade with adm by changing version to `25.10.0` on values files.
+Update all external workers installed by editing the values to use `25.10.0`.
+Remove the vpa helm installation.
+
+```shell
+helm uninstall -n ryaxns ryax-vpa
+```
+
diff --git a/action-builder b/action-builder
@@ -1 +1 @@
-Subproject commit 4fa3f7ea9d04b4c4a383fa68cdd9586816742377
+Subproject commit 014f463ad8803322a6c49cf84a755a8f0f8464ab
diff --git a/action-wrappers b/action-wrappers
@@ -1 +1 @@
-Subproject commit 33b0d7fc37f845f1c442b094f6ef73fd06a74094
+Subproject commit afbdda448eb6926aa7f11c53c39f73e5c2cf5424
diff --git a/adm b/adm
@@ -1 +1 @@
-Subproject commit b5ea21d37f7d1a1bb9285ef400111348c9a03e53
+Subproject commit 0a95468dd162b06caf602f66b631d0b364462c06
diff --git a/authorization b/authorization
@@ -1 +1 @@
-Subproject commit ea30b14339d1cce36c93922790f1978d6ab242d8
+Subproject commit 9d1154dbac833840d594aa82b7c1cb48d8a65342
diff --git a/ci_common b/ci_common
@@ -1 +1 @@
-Subproject commit 87dfd26a2228589c9b617355ec2e840bb3a8c533
+Subproject commit a684417cca159248129f5f19856ff99fae9cd29b
diff --git a/common-helm-charts b/common-helm-charts
@@ -1 +1 @@
-Subproject commit f1d721d89cfc626d6c65ed221189329a38df68ac
+Subproject commit 85e54b7dcc2b484465c82c6062044997d2d2fe90
diff --git a/default-actions b/default-actions
@@ -1 +1 @@
-Subproject commit 27f043401ef498cf3dd672be335dc965d7bc3650
+Subproject commit 4ab3b9bfd3a5cdd484469a20414e12bfec48db9e
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -0,0 +1,20 @@
+{
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+
+  outputs = { nixpkgs, flake-utils, ... }:
+    flake-utils.lib.eachDefaultSystem
+      (system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+        in
+        {
+          devShell = (pkgs.buildFHSEnv {
+            name = "dev-shell";
+            targetPkgs = pkgs: [ pkgs.uv ];
+          }).env;
+
+          formatter = pkgs.nixpkgs-fmt;
+        }
+      );
+}
diff --git a/front b/front
@@ -1 +1 @@
-Subproject commit 578da29640ab1c1e691c854e6d677824600026d5
+Subproject commit 05b98371a0f32a298c0247a5032cb9fa49361cc2
diff --git a/hpc-actions b/hpc-actions
@@ -1 +1 @@
-Subproject commit ea26f7d72f6954232dbd1929f44bbee3b0fea886
+Subproject commit f46005618b110fc9511dc1febdb038c6bd2046e9
diff --git a/intelliscale b/intelliscale
@@ -0,0 +1 @@
+Subproject commit e959aa3e11306c9669310c24d8ff0ec21d0c59e3
diff --git a/jef.py b/jef.py
@@ -16,7 +16,7 @@
 from typing import Any, Dict, List
 import argparse
 
-from git import Repo
+from git import Repo, BadName
 
 
 class TCOLOR:
@@ -34,7 +34,9 @@ class TCOLOR:
     "adm": {
         "gitlab_project": "ryax-tech/ryax/ryax-adm",
     },
-    "vpa": {"gitlab_project": "ryax-tech/ryax/ryax-vpa", "branch": "main"},
+    "intelliscale": {
+        "gitlab_project": "ryax-tech/ryax/ryax-intelliscale"
+    },
     "authorization": {
         "gitlab_project": "ryax-tech/ryax/ryax-authorization",
     },
@@ -185,26 +187,28 @@ def get_last_3_version(repo):
 
 
 def print_last_versions_order(repo) -> None:
-    v = [
-        ("master", repo.commit("master")),
-        ("staging", repo.commit("staging")),
-    ]
-    for ver in get_last_3_version(repo):
-        v.append((ver["tag"], repo.commit(ver["tag"])))
-
-    v = sorted(v, key=lambda x: x[1].committed_datetime, reverse=True)
-
-    prev_commit = None
-    for c in v:
-        if prev_commit is not None:
-            if prev_commit == c[1]:
-                print(f" {TCOLOR.OKGREEN}=={TCOLOR.ENDC} ", end="")
-            else:
-                print(f" {TCOLOR.OKBLUE}>>{TCOLOR.ENDC} ", end="")
-        print(c[0], end="")
-        prev_commit = c[1]
-    print("")
-
+    try:
+        v = [
+            ("master", repo.commit("master")),
+            ("staging", repo.commit("staging")),
+        ]
+        for ver in get_last_3_version(repo):
+            v.append((ver["tag"], repo.commit(ver["tag"])))
+
+        v = sorted(v, key=lambda x: x[1].committed_datetime, reverse=True)
+
+        prev_commit = None
+        for c in v:
+            if prev_commit is not None:
+                if prev_commit == c[1]:
+                    print(f" {TCOLOR.OKGREEN}=={TCOLOR.ENDC} ", end="")
+                else:
+                    print(f" {TCOLOR.OKBLUE}>>{TCOLOR.ENDC} ", end="")
+            print(c[0], end="")
+            prev_commit = c[1]
+        print("")
+    except BadName:
+        print(f"{TCOLOR.WARNING}no staging or master tag found on repo{TCOLOR.ENDC} ")
 
 def command_check_stagings(args) -> None:
     print(
@@ -233,6 +237,19 @@ def command_pull_all(args) -> None:
     print(f"{TCOLOR.OKBLUE}$ git submodule foreach git pull --tags -f{TCOLOR.ENDC}")
     subprocess.run("git submodule foreach git pull --tags -f", shell=True, check=True)
 
+def _force_tag(tag: str) -> None:
+    assert tag
+    print(f"{TCOLOR.OKBLUE}$ git submodule foreach git tag -f {tag}{TCOLOR.ENDC}")
+    subprocess.run(f"git submodule foreach git tag -f {tag}", shell=True, check=True)
+    print(f"{TCOLOR.OKBLUE}$ git submodule foreach git push -f origin {tag}{TCOLOR.ENDC}")
+    subprocess.run(f"git submodule foreach git push -f origin {tag}", shell=True, check=True)
+
+def command_force_staging(args) -> None:
+    _force_tag("staging")
+
+def command_tag_release(args) -> None:
+    _force_tag(args.tag)
+
 
 def command_update_ryax_adm_version(args):
     """
@@ -306,7 +323,7 @@ def print_pipe(reponame, pipe) -> None:
     else:
         status = f"{TCOLOR.WARNING}{status}{TCOLOR.ENDC} "
 
-    print(f"{reponame: <15} {pipe['ref']: <7} {pipe['sha'][:6]} {status} {pipe['url']}")
+    print(f"{reponame: <15} {pipe['ref']: <7} v{pipe['sha'][:8]} {status} {pipe['url']}")
 
 
 def command_wait_all_pipes(args) -> None:
@@ -438,6 +455,21 @@ def command_update_API(args) -> None:
     sp.add_argument("-v", "--version")
     sp.set_defaults(func=command_update_ci_common_version)
 
+    description = "Force all submodule staging branch to align with current version"
+    sp = subparsers.add_parser(
+        "force_staging", description=description, help=description
+    )
+    sp.add_argument("-v", "--version")
+    sp.set_defaults(func=command_force_staging)
+
+    description = "Tag release in all projects, WARNING overwrites existing ones if so"
+    sp = subparsers.add_parser(
+        "tag_release", description=description, help=description
+    )
+    sp.add_argument("-t", "--tag")
+    sp.set_defaults(func=command_tag_release)
+
+
     description = "Update API: generate from the running server <SERVER> a swagger doc, put it on the public doc and generate the SDK for the CLI. Do not commit anything."
     sp = subparsers.add_parser("update_API", description=description, help=description)
     sp.add_argument("server", type=str, default="https://staging.ryax.io")
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,19 @@
+[project]
+name = "ryax-engine"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.11"
+dependencies = [
+    "certifi",
+    "charset-normalizer",
+    "gitdb",
+    "gitpython",
+    "idna",
+    "python-gitlab",
+    "pyyaml",
+    "requests-toolbelt",
+    "requests",
+    "smmap",
+    "urllib3",
+]
diff --git a/repository b/repository
@@ -1 +1 @@
-Subproject commit a8de14ecb46f8148381ffcac1867709e50de7c7a
+Subproject commit 7a66aa4f2a536456c88aedc29606850dee95831e
diff --git a/runner b/runner
@@ -1 +1 @@
-Subproject commit fb58978fdd9a8a74c210312e414594768958e71e
+Subproject commit 495bc0dc4787e608930769c66ba24a62fbc2d962
diff --git a/ryax-public-doc b/ryax-public-doc
@@ -1 +1 @@
-Subproject commit 0217811a23a65b9e35298002915f3b38bfe5c4f2
+Subproject commit ffab33dd7102a3982d1a61d58166a94138373f46
diff --git a/studio b/studio
@@ -1 +1 @@
-Subproject commit aa82766412525044b6971462778aaa831cfcedf7
+Subproject commit e7efb2e76e10a3bc76399f361bec678a0088c43a
diff --git a/uv.lock b/uv.lock
diff --git a/vpa b/vpa
diff --git a/webui b/webui
