From ab1697a660d19dab8b2540b2f4009087c2d356c5 Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Thu, 23 Mar 2023 13:10:13 -0400 Subject: [PATCH] ci: update BlobChecker and BlobPuller integration tests to use more generic manifest template --- .../tools/jib/registry/BlobCheckerIntegrationTest.java | 6 +++--- .../cloud/tools/jib/registry/BlobPullerIntegrationTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jib-core/src/integration-test/java/com/google/cloud/tools/jib/registry/BlobCheckerIntegrationTest.java b/jib-core/src/integration-test/java/com/google/cloud/tools/jib/registry/BlobCheckerIntegrationTest.java index 3c1cef4e25..2c78dfcde8 100644 --- a/jib-core/src/integration-test/java/com/google/cloud/tools/jib/registry/BlobCheckerIntegrationTest.java +++ b/jib-core/src/integration-test/java/com/google/cloud/tools/jib/registry/BlobCheckerIntegrationTest.java @@ -20,7 +20,7 @@ import com.google.cloud.tools.jib.api.RegistryException; import com.google.cloud.tools.jib.event.EventHandlers; import com.google.cloud.tools.jib.http.FailoverHttpClient; -import com.google.cloud.tools.jib.image.json.V22ManifestTemplate; +import com.google.cloud.tools.jib.image.json.BuildableManifestTemplate; import java.io.IOException; import java.security.DigestException; import org.junit.Assert; @@ -36,8 +36,8 @@ public void testCheck_exists() throws IOException, RegistryException { RegistryClient registryClient = RegistryClient.factory(EventHandlers.NONE, "gcr.io", "distroless/base", httpClient) .newRegistryClient(); - V22ManifestTemplate manifestTemplate = - registryClient.pullManifest("latest", V22ManifestTemplate.class).getManifest(); + BuildableManifestTemplate manifestTemplate = + registryClient.pullManifest("latest", BuildableManifestTemplate.class).getManifest(); DescriptorDigest blobDigest = manifestTemplate.getLayers().get(0).getDigest(); Assert.assertEquals(blobDigest, registryClient.checkBlob(blobDigest).get().getDigest()); diff --git a/jib-core/src/integration-test/java/com/google/cloud/tools/jib/registry/BlobPullerIntegrationTest.java b/jib-core/src/integration-test/java/com/google/cloud/tools/jib/registry/BlobPullerIntegrationTest.java index 6a64fbffc5..72afc5277c 100644 --- a/jib-core/src/integration-test/java/com/google/cloud/tools/jib/registry/BlobPullerIntegrationTest.java +++ b/jib-core/src/integration-test/java/com/google/cloud/tools/jib/registry/BlobPullerIntegrationTest.java @@ -21,7 +21,7 @@ import com.google.cloud.tools.jib.blob.Blob; import com.google.cloud.tools.jib.event.EventHandlers; import com.google.cloud.tools.jib.http.FailoverHttpClient; -import com.google.cloud.tools.jib.image.json.V22ManifestTemplate; +import com.google.cloud.tools.jib.image.json.BuildableManifestTemplate; import com.google.common.io.ByteStreams; import java.io.IOException; import java.security.DigestException; @@ -41,8 +41,8 @@ public void testPull() throws IOException, RegistryException { RegistryClient registryClient = RegistryClient.factory(EventHandlers.NONE, "gcr.io", "distroless/base", httpClient) .newRegistryClient(); - V22ManifestTemplate manifestTemplate = - registryClient.pullManifest("latest", V22ManifestTemplate.class).getManifest(); + BuildableManifestTemplate manifestTemplate = + registryClient.pullManifest("latest", BuildableManifestTemplate.class).getManifest(); DescriptorDigest realDigest = manifestTemplate.getLayers().get(0).getDigest();