Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update jre version #51

Merged
merged 9 commits into from
Nov 19, 2024
Merged

chore: update jre version #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0ce9819
chore: update jre version
yanksyoon Nov 13, 2024
063e740
test: use juju 3.56
yanksyoon Nov 13, 2024
444d1f8
update to use juju 3.5 (real commit)
yanksyoon Nov 17, 2024
c15ecc0
microk8s strict channel
yanksyoon Nov 17, 2024
86d1b65
chore: use latest rockcraft syntax
yanksyoon Nov 18, 2024
29c9370
chore: increase idle period
yanksyoon Nov 18, 2024
9a519ce
test: use testing Jenkins version
yanksyoon Nov 19, 2024
489bba1
test: define base and channel w/ branch
yanksyoon Nov 19, 2024
029d312
test: use working branch track
yanksyoon Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/integration_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions jenkins_agent_k8s_rock/rockcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -19,7 +19,7 @@ parts:
overlay-packages:
- bash
- ca-certificates-java
- default-jre-headless
- openjdk-21-jre-headless
- git
- sudo
override-prime: |
Expand Down
9 changes: 7 additions & 2 deletions tests/integration/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="ubuntu@22.04", revision=128
)
await model.wait_for_idle(apps=[app.name], timeout=1200, raise_on_error=False, idle_period=30)

return app

Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ commands =
description = Run integration tests
deps =
pytest
juju==3.0.4
juju>=3,<4
ops
pytest-operator
pytest-asyncio
Expand Down
Loading