@TomSweeneyRedHat I’m not sure this adds much — the "Skopeo Test" tasks in containers/image#2907 already trigger a Skopeo test with an updated c/image.

The thing that I think we need to manage for branching is that the IMAGE_SUFFIX update from containers/image#2907 must be paired (both present, or both absent) with #2661 . I.e. now that c/image’s release-5.36 branch is created before the c/image update, it should point at a Skopeo branch before the Skopeo update — or the update needs to be backported to the c/image branch .

If the two are not in sync, Skopeo CI will always work (as long as Skopeo is internally consistent WRT the CI image and the integration test path) – but c/image CI will break (it will run on a c/image-owned image choice against a Skopeo-owned integration test content).

@mtrmac got it, I think! I just cherry picked that change in c/image into the release-5.36 branch there. I'll vendor that into here.

@mtrmac I have vendored from containers/image@40d1027 this time. Fingers crossed!

@TomSweeneyRedHat this is a solid proof that containers/image#2913 doesn’t hurt, but it changes ~nothing in the Skopeo repo.