diff --git a/.cirrus.yml b/.cirrus.yml index 60f3a5f1a6..fae896cbbb 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -28,7 +28,7 @@ env: UBUNTU_NAME: "ubuntu-2204" # Google-cloud VM Images - IMAGE_SUFFIX: "c5878804328480768" + IMAGE_SUFFIX: "c6340043416535040" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}" diff --git a/integration/registry.go b/integration/registry.go index 89c0bf2cf0..80d0a7e21c 100644 --- a/integration/registry.go +++ b/integration/registry.go @@ -53,6 +53,9 @@ storage: enabled: true http: addr: %s +compatibility: + schema1: + enabled: true %s` var ( htpasswd string @@ -84,12 +87,13 @@ http: return nil, err } - binary := binaryV2 + var cmd *exec.Cmd if schema1 { - binary = binaryV2Schema1 + cmd = exec.Command(binaryV2Schema1, confPath) + } else { + cmd = exec.Command(binaryV2, "serve", confPath) } - cmd := exec.Command(binary, confPath) consumeAndLogOutputs(c, fmt.Sprintf("registry-%s", url), cmd) if err := cmd.Start(); err != nil { if os.IsNotExist(err) {