@misterhuydo/sentinel 1.4.65 → 1.4.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@misterhuydo/sentinel",
-  "version": "1.4.65",
+  "version": "1.4.66",
   "description": "Sentinel — Autonomous DevOps Agent installer and manager",
   "bin": {
     "sentinel": "./bin/sentinel.js"

package/python/sentinel/cicd_trigger.py

@@ -6,6 +6,8 @@ triggered by the normal GitHub merge webhook.
 """
 
 import logging
+import re
+from pathlib import Path
 
 import requests
 
@@ -22,6 +24,8 @@ def trigger(repo: RepoConfig, store: StateStore, fingerprint: str) -> bool:
     cicd_type = repo.cicd_type.lower()
     if cicd_type == "jenkins":
         return _trigger_jenkins(repo)
+    elif cicd_type in ("jenkins_release", "jenkins-release"):
+        return _trigger_jenkins_release(repo)
     elif cicd_type in ("github_actions", "github-actions"):
         return _trigger_github_actions(repo, fingerprint)
     else:
@@ -34,12 +38,53 @@ def _trigger_jenkins(repo: RepoConfig) -> bool:
     resp = requests.post(url, auth=("sentinel", repo.cicd_token), timeout=15)
     success = resp.status_code in (200, 201, 204)
     if success:
-        logger.info("Jenkins triggered: %s", repo.cicd_job_url)
+        logger.info("Jenkins build triggered: %s", repo.cicd_job_url)
     else:
         logger.error("Jenkins trigger failed (%s): %s", resp.status_code, resp.text[:200])
     return success
 
 
+def _trigger_jenkins_release(repo: RepoConfig) -> bool:
+    # Maven Release Plugin — POST to /m2release/submit with release + dev versions
+    release_ver, dev_ver = _maven_release_versions(repo.local_path)
+    url = f"{repo.cicd_job_url.rstrip('/')}/m2release/submit"
+    resp = requests.post(
+        url,
+        auth=(repo.cicd_user or "sentinel", repo.cicd_token),
+        data={
+            "releaseVersion": release_ver,
+            "developmentVersion": dev_ver,
+            "isDryRun": "false",
+            "specifyScmCredentials": "false",
+            "specifyCustomScmCommentPrefix": "false",
+            "specifyCustomScmTag": "false",
+        },
+        timeout=15,
+    )
+    success = resp.status_code in (200, 201, 204)
+    if success:
+        logger.info("Jenkins Maven Release triggered: %s → %s (next: %s)", repo.cicd_job_url, release_ver, dev_ver)
+    else:
+        logger.error("Jenkins release trigger failed (%s): %s", resp.status_code, resp.text[:200])
+    return success
+
+
+def _maven_release_versions(local_path: str) -> tuple[str, str]:
+    """Read current SNAPSHOT version from pom.xml and compute release + next dev versions."""
+    pom = Path(local_path) / "pom.xml"
+    if not pom.exists():
+        return ("", "")
+    text = pom.read_text(encoding="utf-8", errors="ignore")
+    m = re.search(r"<version>(\d+\.\d+\.\d+)-SNAPSHOT</version>", text)
+    if not m:
+        return ("", "")
+    parts = m.group(1).split(".")
+    release_ver = m.group(1)                                          # e.g. 3.0.11
+    next_patch = int(parts[2]) + 1
+    dev_ver = f"{parts[0]}.{parts[1]}.{next_patch}-SNAPSHOT"         # e.g. 3.0.12-SNAPSHOT
+    return release_ver, dev_ver
+
+
 def _trigger_github_actions(repo: RepoConfig, fingerprint: str) -> bool:
     owner_repo = _owner_repo(repo.repo_url)
     url = f"https://api.github.com/repos/{owner_repo}/dispatches"

package/python/sentinel/config_loader.py

@@ -106,6 +106,7 @@ class RepoConfig:
     auto_publish: bool = False
     cicd_type: str = ""
     cicd_job_url: str = ""
+    cicd_user: str = ""      # Jenkins username for Basic auth (defaults to "sentinel")
     health_url: str = ""     # optional: HTTP endpoint returning {"Status": "true"}
     cicd_token: str = ""
     ssh_key_file: str = ""   # path to SSH private key; sets GIT_SSH_COMMAND when present
@@ -238,6 +239,7 @@ class ConfigLoader:
             r.auto_publish = d.get("AUTO_PUBLISH", "false").lower() == "true"
             r.cicd_type = d.get("CICD_TYPE", "")
             r.cicd_job_url = d.get("CICD_JOB_URL", "")
+            r.cicd_user = d.get("CICD_USER", "")
             r.cicd_token = d.get("CICD_TOKEN", "")
             r.health_url = d.get("HEALTH_URL", "")
             r.ssh_key_file = os.path.expanduser(d.get("SSH_KEY_FILE", ""))