Validate rpm and runner

.github/workflows/release.yml

@@ -22,7 +22,7 @@ jobs:
           - release
 
     env:
-      EXTRA_OPTS: --jobs=4 --platform linux/amd64,linux/arm64
+      EXTRA_OPTS: --jobs=4 --platform=linux/amd64,linux/arm64
       EXPECTED_IMAGES: 2
 
     steps:

.github/workflows/task.yml

@@ -25,8 +25,8 @@ jobs:
 
     env:
       # We use this option only on release pipeline due to the heavy cost
-      # EXTRA_OPTS: --platform linux/amd64,linux/arm64
-      EXPECTED_IMAGES: 1
+      EXTRA_OPTS: --platform=linux/amd64,linux/arm64
+      EXPECTED_IMAGES: 2
 
     steps:
       - name: Grab the source from Git

Taskfile.yml

@@ -73,13 +73,12 @@ tasks:
       - ansible-galaxy collection install -r _build/requirements.yml -p collections
       - podman manifest exists {{.CNT_NAME_TAG}} && podman manifest rm {{.CNT_NAME_TAG}} || true
       - podman image exists {{.CNT_NAME_TAG}} && podman image rm {{.CNT_NAME_TAG}} || true
-      - podman buildx build ${EXTRA_OPTS:-} --load {{.CNT_ROOT}} --manifest {{.CNT_NAME_TAG}}
+      - podman buildx build ${EXTRA_OPTS:---platform=linux/amd64,linux/arm64} --load {{.CNT_ROOT}} --manifest {{.CNT_NAME_TAG}}
       # running manifest exists is mandatory as this fails if no manifest is
       # created locally. If this is skipped the inspect might pull the last
       # published manifest instead of using the local one.
       - podman manifest exists {{.CNT_NAME_TAG}}
       # Fail if the manifest does not contain exactly two images
-      - podman manifest inspect {{.CNT_NAME_TAG}} | jq '.manifests | length' | grep -q "${EXPECTED_IMAGES:-2}"
       # Validate image
       - ./_build/validate {{.CNT_NAME_TAG}}
       - touch .task/.{{.CNT_NAME}}.done

_build/validate

@@ -16,5 +16,15 @@ podman run -i --user="$(id -u)" -e EP_DEBUG=1 "$CNT" uname -a
 podman run -i --user="$(id -u)" "$CNT" uname -a
 podman run -i --user="$(id -u)" "$CNT" bash -c 'set | grep PATH'
 podman run -i --user="$(id -u)" "$CNT" command -v ansible-lint
+
 # ensure that git is configured to consider any directory safe:
 podman run -i --user="$(id -u)" "$CNT" bash -c '[[ $(git config safe.directory) == "/" ]]'
+
+# Ensure some packages required are present
+# navigator requires the rpm db be intact as it runs rpm -qa
+podman run -i --user="$(id -u)" "$CNT" bash -c 'rpm -qa | grep python'
+# ansible-runner is needed in all execution environment images
+podman run -i --user="$(id -u)" "$CNT" ansible-runner --version
+
+# ensure that the image is build for both supported architectures and the manifest is correct
+podman manifest inspect "$CNT" | jq '.manifests | length' | grep -q "${EXPECTED_IMAGES:-2}"