Skip to content

Commit e6b2cb8

Browse files
committed
job-builder: add CoCo operator jobs for Ubuntu 22.04
Run jobs on Ubuntu 22.04 with containerd 1.7, so we test the case here `INSTALL_OFFICIAL_CONTAINERD=false`, i.e., the operator will use the system's containerd. Fixes kata-containers#551 Signed-off-by: Wainer dos Santos Moschetta <[email protected]>
1 parent a0b1961 commit e6b2cb8

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

jobs-builder/jobs/cc.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@
314314
name: "Generate jobs for the Confidential Containers Operator"
315315
os:
316316
- ubuntu-20.04
317+
- ubuntu-22.04
317318
arch:
318319
- x86_64
319320
baremetal: "false"

jobs-builder/jobs/include/operator-ci_entrypoint.sh.inc

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99

1010
sudo apt-get update -y
1111
sudo apt-get install -y ansible python-is-python3
12+
# Ubuntu 22.04 comes with docker community edition that we don't want to
13+
# use.
14+
sudo apt-get remove -y docker-ce docker-ce-cli containerd.io || true
15+
sudo apt autoremove -y
1216
cd tests/e2e
1317
export PATH="$PATH:/usr/local/bin"
1418
./run-local.sh -r "{{ runtimeclass }}" {%+ if baremetal == "true" %}-u{% endif %}

jobs-builder/jobs/include/os2node.yaml.inc

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ fedora35_azure
1212
ubuntu1804_azure || ubuntu1804-azure
1313
{%- elif os == "ubuntu-20.04" -%}
1414
ubuntu_20.04
15+
{%- elif os == "ubuntu-22.04" -%}
16+
ubuntu22_04
1517
{%- elif os == "ubuntu-20.04_sev" -%}
1618
amd-ubuntu-2004
1719
{%- elif os == "ubuntu-20.04_snp" -%}

0 commit comments

Comments
 (0)