Merge branch 'main' into ISD-1521-cos-longterm

canonical · Jan 18, 2024 · ae5ec06 · ae5ec06
2 parents 35c5f8f + 1f11e2e
commit ae5ec06
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/e2e_test.yaml b/.github/workflows/e2e_test.yaml
@@ -34,7 +34,7 @@ jobs:
           EOF
 
       - name: Cache github-runner Charm
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-charm
         with:
           path: github-runner_ubuntu-22.04-amd64.charm

diff --git a/.github/workflows/workflow_dispatch_ssh_debug.yaml b/.github/workflows/workflow_dispatch_ssh_debug.yaml
@@ -14,4 +14,4 @@ jobs:
     steps:
     - name: Setup tmate session
       uses: canonical/action-tmate@chore/env_var_change
-      timeout-minutes: 1
+      timeout-minutes: 5
diff --git a/scripts/build-image.sh b/scripts/build-image.sh
@@ -87,6 +87,8 @@ retry '/snap/bin/lxc exec builder -- /usr/bin/nslookup github.com' 'Wait for net
 /snap/bin/lxc exec builder -- /usr/bin/apt-get update
 /snap/bin/lxc exec builder --env DEBIAN_FRONTEND=noninteractive -- /usr/bin/apt-get upgrade -yq
 /snap/bin/lxc exec builder --env DEBIAN_FRONTEND=noninteractive -- /usr/bin/apt-get install linux-generic-hwe-22.04 -yq
+# This will remove older version of kernel as HWE is installed now.
+/snap/bin/lxc exec builder -- /usr/bin/apt-get autoremove --purge
 
 /snap/bin/lxc restart builder
 retry '/snap/bin/lxc exec builder -- /usr/bin/who' 'Wait for lxd agent to be ready' 30
@@ -107,6 +109,10 @@ fi
 /snap/bin/lxc exec builder -- /usr/sbin/usermod -aG docker ubuntu
 /snap/bin/lxc exec builder -- /usr/sbin/iptables -I DOCKER-USER -j ACCEPT
 
+# Reduce image size
+/snap/bin/lxc exec builder -- /usr/bin/npm cache clean --force
+/snap/bin/lxc exec builder -- /usr/bin/apt-get clean
+
 # Download and verify checksum of yq
 if [[ $(uname -m) == 'aarch64' ]]; then
     YQ_ARCH="arm64"