chore: update jenkins lts version (#45)

* chore: update jenkins lts version * chore: update jenkins plugin manager version * chore: update jenkins plugin manager version in tests * chore: fix wizard integration test
canonical · Nov 2, 2023 · 189114b · 189114b
1 parent f4a1eb3
commit 189114b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/jenkins_rock/rockcraft.yaml b/jenkins_rock/rockcraft.yaml
@@ -40,8 +40,8 @@ parts:
       - default-jre-headless
       - git
     build-environment:
-      - JENKINS_VERSION: 2.387
-      - JENKINS_PLUGIN_MANAGER_VERSION: 2.12.11
+      - JENKINS_VERSION: 2.414.1
+      - JENKINS_PLUGIN_MANAGER_VERSION: 2.12.13
     override-build: |
       mkdir -p ${CRAFT_PART_INSTALL}/{srv/jenkins/,etc/default/jenkins/}
       # Use jenkins war rather than apt install for easier Jenkins version control.

diff --git a/src/jenkins.py b/src/jenkins.py
@@ -352,7 +352,7 @@ def _install_plugins(
         "java",
         *proxy_args,
         "-jar",
-        "jenkins-plugin-manager-2.12.11.jar",
+        "jenkins-plugin-manager-2.12.13.jar",
         "-w",
         "jenkins.war",
         "-d",

diff --git a/tests/integration/helpers.py b/tests/integration/helpers.py
@@ -42,7 +42,7 @@ async def install_plugins(
         unit.name,
         "java",
         "-jar",
-        f"{jenkins.EXECUTABLES_PATH / 'jenkins-plugin-manager-2.12.11.jar'}",
+        f"{jenkins.EXECUTABLES_PATH / 'jenkins-plugin-manager-2.12.13.jar'}",
         "-w",
         f"{jenkins.EXECUTABLES_PATH / 'jenkins.war'}",
         "-d",

diff --git a/tests/integration/test_k8s_agent.py b/tests/integration/test_k8s_agent.py
@@ -33,7 +33,7 @@ async def test_jenkins_wizard_bypass(web_address: str):
     # This should not appear since when Jenkins setup is complete, the wizard should have been
     # bypassed.
     assert "Unlock Jenkins" not in str(response.content), "Jenkins setup wizard not bypassed."
-    assert "Welcome to Jenkins!" in str(response.content)
+    assert "Sign in to Jenkins" in str(response.content)
 
 
 async def test_jenkins_k8s_agent_relation(

diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
@@ -198,7 +198,7 @@ def cmd_handler(argv: list[str]) -> tuple[int, str, str]:
             case _ if [
                 "java",
                 "-jar",
-                "jenkins-plugin-manager-2.12.11.jar",
+                "jenkins-plugin-manager-2.12.13.jar",
                 "-w",
                 "jenkins.war",
                 "-d",
@@ -219,7 +219,7 @@ def cmd_handler(argv: list[str]) -> tuple[int, str, str]:
                 f"-Dhttps.proxyPassword={proxy_config.https_proxy.password}",
                 f'-Dhttp.nonProxyHosts="{no_proxy_hosts}"',
                 "-jar",
-                "jenkins-plugin-manager-2.12.11.jar",
+                "jenkins-plugin-manager-2.12.13.jar",
                 "-w",
                 "jenkins.war",
                 "-d",