Change built image name to jammy (#179)

* Change built image name to jammy * Check for the jammy label in e2e test
canonical · Jan 3, 2024 · 8e3799a · 8e3799a
1 parent 9f9bca8
commit 8e3799a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/e2e_test.yaml b/.github/workflows/e2e_test.yaml
@@ -431,7 +431,7 @@ jobs:
   e2e-test:
     name: End-to-End Test
     needs: [build-charm, run-id]
-    runs-on: [self-hosted, linux, x64, "pr-${{ needs.run-id.outputs.run-id }}"]
+    runs-on: [self-hosted, linux, x64, jammy, "pr-${{ needs.run-id.outputs.run-id }}"]
     steps:
       # Snapd can have some issues in privileged LXD containers without setting
       # security.nesting=True and this.

diff --git a/scripts/build-image.sh b/scripts/build-image.sh
@@ -107,9 +107,9 @@ fi
 /snap/bin/lxc publish builder --alias builder --reuse -f
 
 # Swap in the built image
-/snap/bin/lxc image alias rename runner old-runner || true
-/snap/bin/lxc image alias rename builder runner
-/snap/bin/lxc image delete old-runner || true
+/snap/bin/lxc image alias rename jammy old-jammy || true
+/snap/bin/lxc image alias rename builder jammy
+/snap/bin/lxc image delete old-jammy || true
 
 # Clean up LXD instance
 cleanup '/snap/bin/lxc info builder &> /dev/null' '/snap/bin/lxc delete builder --force' 'Cleanup LXD instance' 10
diff --git a/src/charm.py b/src/charm.py
@@ -306,7 +306,7 @@ def _get_runner_manager(
             RunnerManagerConfig(
                 path=path,
                 token=token,
-                image="runner",
+                image="jammy",
                 service_token=self.service_token,
                 lxd_storage_path=self.ram_pool_path,
                 charm_state=self._state,

diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
@@ -120,7 +120,7 @@ def test_org_register(self, run, wt, mkdir, rm):
             RunnerManagerConfig(
                 path=GithubOrg(org="mockorg", group="mockgroup"),
                 token="mocktoken",
-                image="runner",
+                image="jammy",
                 service_token=token,
                 lxd_storage_path=GithubRunnerCharm.ram_pool_path,
                 charm_state=harness.charm._state,
@@ -146,7 +146,7 @@ def test_repo_register(self, run, wt, mkdir, rm):
             RunnerManagerConfig(
                 path=GithubRepo(owner="mockorg", repo="repo"),
                 token="mocktoken",
-                image="runner",
+                image="jammy",
                 service_token=token,
                 lxd_storage_path=GithubRunnerCharm.ram_pool_path,
                 charm_state=harness.charm._state,
@@ -177,7 +177,7 @@ def test_update_config(self, run, wt, mkdir, rm):
             RunnerManagerConfig(
                 path=GithubRepo(owner="mockorg", repo="repo"),
                 token="mocktoken",
-                image="runner",
+                image="jammy",
                 service_token=token,
                 lxd_storage_path=GithubRunnerCharm.ram_pool_path,
                 charm_state=harness.charm._state,
@@ -197,7 +197,7 @@ def test_update_config(self, run, wt, mkdir, rm):
             RunnerManagerConfig(
                 path=GithubRepo(owner="mockorg", repo="repo"),
                 token="mocktoken",
-                image="runner",
+                image="jammy",
                 service_token=token,
                 lxd_storage_path=GithubRunnerCharm.ram_pool_path,
                 charm_state=harness.charm._state,