]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/rgw: ignore 'keytool: command for found' errors
authorCasey Bodley <cbodley@redhat.com>
Thu, 21 May 2026 13:54:16 +0000 (09:54 -0400)
committerCasey Bodley <cbodley@redhat.com>
Thu, 21 May 2026 14:32:28 +0000 (10:32 -0400)
this 'keytool' invocation was moved from qa/tasks/s3tests_java.py to
qa/tasks/rgw.py so that it would also cover the java checksum tests

but that means it runs for any rgw job with https enabled, even if it
doesn't install or use any java stuff. the 'keytool' command itself
comes from jdk packages which aren't installed by default

ignore errors from this command so that subsuites can use https without
installing java

Signed-off-by: Casey Bodley <cbodley@redhat.com>
qa/tasks/rgw.py

index aaa90bb4ba6d7cb15488eda10916cd819fd0d3c5..ede35191ac1b46b14e396c75ff0eb9e0b2ee2fc1 100644 (file)
@@ -81,6 +81,10 @@ def start_rgw(ctx, config, clients):
             # add the ssl certificate path
             frontends += ' ssl_certificate={}'.format(endpoint.cert.certificate)
             frontends += ' ssl_port={}'.format(endpoint.port)
+
+            # install the cert to the java store for java tests. this may fail
+            # with 'keytool: command not found' for jobs that don't install java
+            # stuff, so add check_status=False to ignore
             path = 'lib/security/cacerts'
             ctx.cluster.only(client).run(
                 args=['sudo',
@@ -93,7 +97,8 @@ def start_rgw(ctx, config, clients):
                       '-file', endpoint.cert.certificate,
                       '-storepass', 'changeit',
                       ],
-                stdout=BytesIO()
+                stdout=BytesIO(),
+                check_status=False
             )
 
         else: