tests: update CI images

[giuseppe]

preparation work for: containers/common#573

Signed-off-by: Giuseppe Scrivano [email protected]

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [giuseppe]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[giuseppe]

we need an updated runc. v1.0-rc95 has the feature we need

[rhatdan]

@cevich PTAL

[cevich]

we need an updated runc. v1.0-rc95 has the feature we need

Sorry only just seeing this now after being on PTO last week. Okay, I'll build new VM images...okay, opened a PR.

[cevich]

@giuseppe okay, give image suffix c6704734020042752 a try.

$ podman run -it --rm quay.io/libpod/fedora_podman:c6704734020042752 rpm -q runc
Trying to pull quay.io/libpod/fedora_podman:c6704734020042752...
Getting image source signatures
Copying blob 1ab2777b591f done
Copying blob 76d9e8b34382 done
Copying config 3584509b8e done
Writing manifest to image destination
Storing signatures
runc-1.0.0-378.rc95.fc34.x86_64

[rhatdan]

@giuseppe needs a rebase. @cevich I think we need new VMs to get latest runc.

[giuseppe]

addressed the comments ⬆️

[rhatdan]

So we revert this PR or at least the separation of the VMs once selinux-policy gets updated.

[cevich]

LGTM

[cevich]

So we revert this PR or at least the separation of the VMs once selinux-policy gets updated.

Just the one .cirrus.yml: use c5521575421149184 for Ubuntu commit.

But if this takes longer than 30-days, there's a very not-obvious problem WRT image pruning. I'll open a followup PR so the tests don't all need to be re-run for it (here).

[cevich]

...in case you want to include it in the one commit (would be convenient for reverting), this is what I'm thinking:

diff --git a/.cirrus.yml b/.cirrus.yml
index a403889c6..026843503 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -678,6 +678,8 @@ meta_task:
             ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
             ${UBUNTU_CACHE_IMAGE_NAME}
             ${PRIOR_UBUNTU_CACHE_IMAGE_NAME}
+            "ubuntu-${IMAGE_SUFFIX}"
+            "prior-ubuntu-${IMAGE_SUFFIX}"
         BUILDID: "${CIRRUS_BUILD_ID}"
         REPOREF: "${CIRRUS_REPO_NAME}"
         GCPJSON: ENCRYPTED[3a198350077849c8df14b723c0f4c9fece9ebe6408d35982e7adf2105a33f8e0e166ed3ed614875a0887e1af2b8775f4]

[giuseppe]

thanks for the suggestion. I've amended the change in the last version

[cevich]

oof, my bad...

diff --git a/.cirrus.yml b/.cirrus.yml
index a403889c6..026843503 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -678,6 +678,8 @@ meta_task:
             ${PRIOR_FEDORA_CACHE_IMAGE_NAME}
             ${UBUNTU_CACHE_IMAGE_NAME}
             ${PRIOR_UBUNTU_CACHE_IMAGE_NAME}
+            ubuntu-${IMAGE_SUFFIX}
+            prior-ubuntu-${IMAGE_SUFFIX}
         BUILDID: "${CIRRUS_BUILD_ID}"
         REPOREF: "${CIRRUS_REPO_NAME}"
         GCPJSON: ENCRYPTED[3a198350077849c8df14b723c0f4c9fece9ebe6408d35982e7adf2105a33f8e0e166ed3ed614875a0887e1af2b8775f4]

[cevich]

Okay, welp, since we're re-spinning tests I can close my PR then. Sorry for the noise/churn, I was trying to help avoid needing to re-run all the tests while there's the annoying system-test flake (assuming it's still a thing).

[giuseppe]

looks like the test doesn't like the last diff:

ERROR: (gcloud.compute.images.update) HTTPError 400: Invalid value for field 'image': '"ubuntu-c5348179051806720"'. Must be a match of regex '[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?|[1-9][0-9]{0,19}'
�[1;33mDetected update error for '"ubuntu-c5348179051806720"'�[0m
ERROR: (gcloud.compute.images.update) HTTPError 400: Invalid value for field 'image': '"prior-ubuntu-c5348179051806720"'. Must be a match of regex '[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?|[1-9][0-9]{0,19}'
�[1;33mDetected update error for '"prior-ubuntu-c5348179051806720"'�[0m
�[1;31mERROR: ERROR: Failed to update one or more image timestamps:  "ubuntu-c5348179051806720" "prior-ubuntu-c5348179051806720"�[0m

[giuseppe]

reverted it back, and the CI is smart to turn immediately green :-)

[rhatdan]

LGTM

[rhatdan]

/lgtm