fix: run offline tests for ubuntu 22.04

mesosphere · Jan 13, 2025 · fd5d7e5 · fd5d7e5
1 parent c8ce080
commit fd5d7e5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/aws-e2e.yaml b/.github/workflows/aws-e2e.yaml
@@ -70,6 +70,8 @@ jobs:
             buildConfig: "basic"
           - os: "ubuntu 22.04"
             buildConfig: "nvidia"
+          - os: "ubuntu 22.04"
+            buildConfig: "offline"
           # Rocky 9.1
           - os: "rocky 9.1"
             buildConfig: "basic"

diff --git a/.github/workflows/vsphere-e2e.yaml b/.github/workflows/vsphere-e2e.yaml
@@ -29,6 +29,8 @@ jobs:
           buildConfig: "basic"
         - os: "ubuntu 22.04"
           buildConfig: "basic"
+        - os: "ubuntu 22.04"
+          buildConfig: "offline"
         - os: "rocky 9.1"
           buildConfig: "offline"
         - os: "oracle 9.4"

diff --git a/bundles/ubuntu22.04/bundle.sh.gotmpl b/bundles/ubuntu22.04/bundle.sh.gotmpl
@@ -21,9 +21,6 @@ sed -i 's/kubelet/kubelet='"{{ .KubernetesVersion }}-${KUBERNETES_DEB_BUILD_VERS
 sed -i 's/kubectl/kubectl='"{{ .KubernetesVersion }}-${KUBERNETES_DEB_BUILD_VERSION}"'/' /tmp/packages
 sed -i 's/kubeadm/kubeadm='"{{ .KubernetesVersion }}-${KUBERNETES_DEB_BUILD_VERSION}"'/' /tmp/packages
 sed -i 's/cri-tools/cri-tools='"{{ .CRIToolsVersion }}-${CRI_TOOLS_DEB_BUILD_VERSION}"'/' /tmp/packages
-# https://github.com/kubernetes-sigs/cluster-api-provider-aws/issues/4745 pins version for CAPA
-# enable it back if https://github.com/kubernetes-sigs/cluster-api-provider-aws/issues/4745, https://github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5115 are resolved
-echo 'cloud-init=23.1.2-0ubuntu0~22.04.1' >> /tmp/packages
 
 TMP_DIR="$(mktemp -d repodata-XXXX)"
 pushd "${TMP_DIR}"