podvm: remove CentOS support

The podvm build for CentOS has been broken for a while now (see #1558)
and even on the last release (0.8.0) we didn't publish an image. After
some discussions in #1564
and in our community's meeting today there is a consensus that CentOS
support can be dropped.

Important to say that we will continue building an RPM-based distro
(Fedora) but with the mkosi tool instead of packer.

Somehow-fixes #1558
Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

.github/workflows/e2e_run_all.yaml

@@ -155,9 +155,6 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          # FIXME: temporarily disable CentOS tests as the CentOS podvm builds
-          # are disabled due https://github.com/confidential-containers/cloud-api-adaptor/issues/1558
-          #- centos
           - ubuntu
         provider:
           - generic

.github/workflows/podvm.yaml

@@ -23,22 +23,14 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          # FIXME: temporarily disable CentOS builds while we don't find a
-          # fix to https://github.com/confidential-containers/cloud-api-adaptor/issues/1558
-          #- centos
           - ubuntu
         arch: [amd64, s390x]
         provider: [generic, vsphere]
         include:
-          #- os: centos
           - os: ubuntu
         exclude:
-          #- os: centos
-          #  arch: s390x
           - provider: vsphere
             arch: s390x
-          #- provider: vsphere
-          #  os: centos
     steps:
     - name: Checkout Code
       uses: actions/checkout@v3

.github/workflows/podvm_binaries.yaml

@@ -22,14 +22,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [centos, ubuntu]
+        os: [ubuntu]
         arch: [amd64, s390x]
         include:
-          - os: centos
           - os: ubuntu
-        exclude:
-          - os: centos
-            arch: s390x
     steps:
     - name: Checkout Code
       uses: actions/checkout@v3

.github/workflows/podvm_builder.yaml

@@ -24,7 +24,6 @@ jobs:
       matrix:
         os:
           # Please keep this list in alphabetical order.
-          - centos
           - ubuntu
         runner:
           - ubuntu-latest

Makefile.defaults

@@ -25,15 +25,12 @@ $(or $(shell $(YQ_COMMAND) '.$(1) | select(. != null)' $(VERSIONS_SRC)), \
 endef
 
 ubuntu_RELEASE ?= focal
-centos_RELEASE ?= stream-9
 rhel_RELEASE ?= 9
 
 ubuntu_amd64_IMAGE_URL := $(call query,cloudimg.ubuntu.$(ubuntu_RELEASE).amd64.url)
 ubuntu_amd64_IMAGE_CHECKSUM := $(call query,cloudimg.ubuntu.$(ubuntu_RELEASE).amd64.checksum)
 ubuntu_s390x_IMAGE_URL := $(call query,cloudimg.ubuntu.$(ubuntu_RELEASE).s390x.url)
 ubuntu_s390x_IMAGE_CHECKSUM := $(call query,cloudimg.ubuntu.$(ubuntu_RELEASE).s390x.checksum)
-centos_amd64_IMAGE_URL := $(call query,cloudimg.centos.$(centos_RELEASE).amd64.url)
-centos_amd64_IMAGE_CHECKSUM := $(call query,cloudimg.centos.$(centos_RELEASE).amd64.checksum)
 rhel_amd64_IMAGE_URL := $(call query,cloudimg.rhel.$(rhel_RELEASE).amd64.url)
 rhel_amd64_IMAGE_CHECKSUM := $(call query,cloudimg.rhel.$(rhel_RELEASE).amd64.checksum)
 rhel_s390x_IMAGE_URL := $(call query,cloudimg.rhel.$(rhel_RELEASE).s390x.url)

README.md

@@ -54,8 +54,8 @@ To create a QCOW2 image which can be imported into your provider of choice, you
 make podvm-builder podvm-binaries podvm-image
 # or to produce an s390x architecture image
 ARCH=s390x make podvm-builder podvm-binaries podvm-image
-# or to produce a centos distribution image
-PODVM_DISTRO=centos make podvm-builder podvm-binaries podvm-image
+# or to produce a rhel distribution image
+PODVM_DISTRO=rhel make podvm-builder podvm-binaries podvm-image
 ```
 
 > N.B. This will populate the image using the component versions found in [versions.yaml](./versions.yaml).

aws/README.md

@@ -72,6 +72,8 @@ docker build -t aws \
 -f Dockerfile .
 ```
 
+>Note: images for CentOS Stream haven't been built since the release 0.8.0 of this project.
+
 - Note down your newly created AMI_ID
 
 Once the image creation is complete, you can use the following CLI command as well to

docs/consuming-prebuilt-podvm-images.md

@@ -10,6 +10,7 @@ For example:
 - https://quay.io/repository/confidential-containers/podvm-generic-ubuntu-s390x hosts the Ubuntu images that can be used for s390x architecture.
 - https://quay.io/repository/confidential-containers/podvm-generic-centos-amd64 hosts the CentOS images that can be used with all providers (except vsphere).
 
+>Note: images for CentOS Stream haven't been built since the release 0.8.0 of this project.
 
 The easiest way to extract the qcow2 file from the podvm container image is using the [`download-image.sh`](../podvm/hack/download-image.sh) script. For example, to extract the file from the *podvm-generic-ubuntu-amd64* image:
 

podvm/Makefile

@@ -51,8 +51,6 @@ endif
 endif
 else ifeq ($(PODVM_DISTRO),rhel)
 	$(eval OPTS := -var disk_size=11144)
-else ifeq ($(PODVM_DISTRO),centos)
-	$(eval OPTS := )
 else
 	$(error PODVM_DISTRO is invalid or not defined)
 endif

podvm/README.md

@@ -43,7 +43,7 @@ The builder image packages the cloud-api-adaptor and Kata Containers sources as
 the binaries (e.g. *kata-agent* and *agent-protocol-forwarder*) that should be installed in the podvm image.
 
 The builder image is agnostic to cloud providers in the sense that one can be used to build for multiple providers, however it is
-dependent on the Linux distribution the image is built for. Therefore, in this directory you will find dockerfiles for each supported distributions, which are currently Ubuntu 20.04 ([Dockerfile.podvm_builder](./Dockerfile.podvm_builder)), CentOS Stream 9 ([Dockerfile.podvm_builder.centos](./Dockerfile.podvm_builder.centos)), and RHEL 9 ([Dockerfile.podvm_builder.rhel](./Dockerfile.podvm_builder.rhel)).
+dependent on the Linux distribution the image is built for. Therefore, in this directory you will find dockerfiles for each supported distributions, which are currently Ubuntu 20.04 ([Dockerfile.podvm_builder](./Dockerfile.podvm_builder)), and RHEL 9 ([Dockerfile.podvm_builder.rhel](./Dockerfile.podvm_builder.rhel)).
 
 As an example, to build the builder image for Ubuntu, run: