modules/mu/clouds/google.rb in cloud-mu-3.0.0beta vs modules/mu/clouds/google.rb in cloud-mu-3.0.0

@@ -350,12 +350,11 @@
             objectobj,
             upload_source: f.path
           )
           f.unlink
         rescue ::Google::Apis::ClientError => e
-# XXX comment for NCBI tests
-#          raise MU::MommaCat::DeployInitializeError, "Got #{e.inspect} trying to write #{name} to #{adminBucketName(credentials)}"
+          raise MU::MommaCat::DeployInitializeError, "Got #{e.inspect} trying to write #{name} to #{adminBucketName(credentials)}"
         end
       end
 
       # Remove the service account and various deploy secrets associated with a deployment. Intended for invocation from MU::Cleanup.
       # @param deploy_id [String]: The deploy for which we're granting the secret
@@ -404,10 +403,10 @@
           }
         rescue ::Google::Apis::ClientError => e
 MU.log e.message, MU::WARN, details: e.inspect
           if e.inspect.match(/body: "Not Found"/)
             raise MuError, "Google admin bucket #{adminBucketName(credentials)} or key #{name} does not appear to exist or is not visible with #{credentials ? credentials : "default"} credentials"
-          elsif e.message.match(/notFound: /)
+          elsif e.message.match(/notFound: |Unknown user:/)
             if retries < 5
               sleep 5
               retries += 1
               retry
             else