Merge pull request #2834 from ricardobranco777/forceamd64

integration: Force amd64 on TestProxyMetadata
This commit is contained in:
Miloslav Trmač
2026-03-30 15:45:40 +02:00
committed by GitHub

View File

@@ -261,7 +261,7 @@ func (p *proxy) callGetRawBlob(args []any) (rval any, buf []byte, err error) {
return
}
func newProxy() (*proxy, error) {
func newProxy(extraArgs ...string) (*proxy, error) {
fds, err := syscall.Socketpair(syscall.AF_LOCAL, syscall.SOCK_SEQPACKET, 0)
if err != nil {
return nil, err
@@ -277,7 +277,8 @@ func newProxy() (*proxy, error) {
}
// Note ExtraFiles starts at 3
proc := exec.Command(skopeoBinary, "experimental-image-proxy", "--sockfd", "3")
args := append(append([]string{}, extraArgs...), "experimental-image-proxy", "--sockfd", "3")
proc := exec.Command(skopeoBinary, args...)
proc.Stderr = os.Stderr
cmdLifecycleToParentIfPossible(proc)
proc.ExtraFiles = append(proc.ExtraFiles, theirfd)
@@ -475,7 +476,8 @@ func runTestGetBlob(p *proxy, img string) error {
func (s *proxySuite) TestProxyMetadata() {
t := s.T()
p, err := newProxy()
// The test image quay.io/coreos/11bot is only available for amd64
p, err := newProxy("--override-arch", "amd64")
require.NoError(t, err)
err = runTestMetadataAPIs(p, knownNotManifestListedImageX8664)