c9s: always get containers-common from appstream

There's a messy situation right now where the containers-common package
is higher versioned in OCP than in c9s proper. And because we need the
OCP repo for now to compose SCOS, we get the OCP one, which causes
issues because unlike the c9s version, it doesn't ship the RHEL keys.

Work around this by pinning containers-common to the c9s-appstream repo.

See also: openshift#1505 (comment)

Fixes: openshift#1505

manifest-c9s.yaml

@@ -136,3 +136,6 @@ repo-packages:
       - nss-altfiles
       # Use the new containers/toolbox
       - toolbox
+      # The one shipping in C9S is temporarily lower versioned, so be explicit
+      # https://github.com/openshift/os/issues/1505
+      - containers-common

tests/kola/systemd/journal-compat

@@ -13,7 +13,12 @@ set -euo pipefail
 cd $(mktemp -d)
 
 # The string Linux should match the kernel boot
-podman run --privileged --net=none -v /var/log:/var/log:ro --rm registry.access.redhat.com/ubi8/ubi:latest journalctl -D /var/log/journal --grep="Linux" > journal.txt 2>err.txt
+rc=0
+podman run --privileged --net=none -v /var/log:/var/log:ro --rm registry.access.redhat.com/ubi8/ubi:latest journalctl -D /var/log/journal --grep="Linux" > journal.txt 2>err.txt || rc=$?
+if [ "$rc" != 0 ]; then
+    cat err.txt
+    fatal "podman run exited with rc=$rc"
+fi
 if grep -qF 'uses an unsupported feature' err.txt; then
     fatal "Got unsupported feature trying to read journal"
 fi