Fix integration tests (#2660)

* Fix integration tests

* Comment update

---------

Co-authored-by: Nikhil Sinha <nsinha@cloudflare.com>

Author: NikhilSinha1

pkg/image/build.go

@@ -86,7 +86,8 @@ func Build(
 	var cogBaseImageName string
 
 	tmpImageId := imageName
-	if strings.HasPrefix(imageName, "r8.im") {
+	isR8imImage := strings.HasPrefix(imageName, "r8.im")
+	if isR8imImage {
 		hash := sha256.New()
 		_, err := hash.Write([]byte(imageName))
 		if err != nil {
@@ -327,9 +328,13 @@ func Build(
 		return fmt.Errorf("Failed to add labels to image: %w", err)
 	}
 
-	if err = dockerCommand.RemoveImage(ctx, tmpImageId); err != nil {
-		return err
+	// We created a temp image, so delete it. Don't "-f" so it doesn't blow anything up
+	if isR8imImage {
+		if err = dockerCommand.RemoveImage(ctx, tmpImageId); err != nil {
+			return err
+		}
 	}
+
 	return nil
 }
 

python/cog/server/worker.py

@@ -846,7 +846,6 @@ async def _healthcheck_internal(
                 "User-defined healthcheck timed out",
                 timeout_secs=HEALTHCHECK_TIMEOUT,
             )
-            log.warn(f"Healthcheck timed out after {HEALTHCHECK_TIMEOUT} seconds")
         except Exception as e:
             done.error = True
             done.error_detail = f"Healthcheck failed: {str(e)}"