chore: update jre version (#51)

* chore: update jre version

* test: use juju 3.56

* update to use juju 3.5 (real commit)

* microk8s strict channel

* chore: use latest rockcraft syntax

* chore: increase idle period

* test: use testing Jenkins version

* test: define base and channel w/ branch

* test: use working branch track

.github/workflows/integration_test.yaml

@@ -15,3 +15,8 @@ jobs:
       extra-arguments: |
         --kube-config=${GITHUB_WORKSPACE}/kube-config
       modules: '["test_agent_k8s.py"]'
+      juju-channel: 3.5/stable
+      channel: 1.31-strict/stable
+      self-hosted-runner: true
+      self-hosted-runner-label: "xlarge"
+      microk8s-addons: "dns ingress rbac storage metallb:10.15.119.2-10.15.119.4 registry"

jenkins_agent_k8s_rock/rockcraft.yaml

@@ -5,8 +5,8 @@ name: jenkins-agent-k8s
 summary: Jenkins-agent-k8s rock
 description: Jenkins-agent-k8s OCI image for the Jenkins-agent-k8s charm
 version: "1.1"
-base: ubuntu:22.04
-build-base: ubuntu:22.04
+base: ubuntu@22.04
+build-base: ubuntu@22.04
 license: Apache-2.0
 platforms:
   amd64:
@@ -19,7 +19,7 @@ parts:
     overlay-packages:
       - bash
       - ca-certificates-java
-      - default-jre-headless
+      - openjdk-21-jre-headless
       - git
       - sudo
     override-prime: |

tests/integration/conftest.py

@@ -171,8 +171,13 @@ async def machine_jenkins_client_fixture(
 @pytest_asyncio.fixture(scope="module", name="jenkins_k8s_server")
 async def jenkins_k8s_server_fixture(model: Model) -> Application:
     """The jenkins k8s server."""
-    app = await model.deploy("jenkins-k8s", series="jammy", channel="latest/edge")
-    await model.wait_for_idle(apps=[app.name], timeout=1200, raise_on_error=False)
+    # A custom JRE/Jenkins LTS upgraded version of Jenkins has been manually pushed to latest/edge
+    # channel revision 128 for testing. There's a deadlock on the dependency in testing
+    # jenkins-agent-k8s and jenkins-k8s.
+    app = await model.deploy(
+        "jenkins-k8s", series="jammy", channel="latest/edge", base="[email protected]", revision=128
+    )
+    await model.wait_for_idle(apps=[app.name], timeout=1200, raise_on_error=False, idle_period=30)
 
     return app
 

tox.ini

@@ -105,7 +105,7 @@ commands =
 description = Run integration tests
 deps =
     pytest
-    juju==3.0.4
+    juju>=3,<4
     ops
     pytest-operator
     pytest-asyncio