Fixes after adding UBI Docker support

The CertGenCliTests needed an update to ignore the UBI Docker
distribution as well as the regular Docker distribution.

Author: pugnascotia

qa/os/src/test/java/org/elasticsearch/packaging/test/CertGenCliTests.java

@@ -50,7 +50,7 @@ public class CertGenCliTests extends PackagingTestCase {
     @Before
     public void filterDistros() {
         assumeTrue("only default distro", distribution.flavor == Distribution.Flavor.DEFAULT);
-        assumeTrue("no docker", distribution.packaging != Distribution.Packaging.DOCKER);
+        assumeFalse("no docker", distribution.isDocker());
     }
 
     @BeforeClass

qa/os/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java

@@ -216,6 +216,7 @@ protected static void install() throws Exception {
                 Packages.verifyPackageInstallation(installation, distribution, sh);
                 break;
             case DOCKER:
+            case DOCKER_UBI:
                 installation = Docker.runContainer(distribution);
                 Docker.verifyContainerInstallation(installation, distribution);
                 break;
@@ -291,6 +292,7 @@ public Shell.Result runElasticsearchStartCommand(String password, boolean daemon
             case RPM:
                 return Packages.runElasticsearchStartCommand(sh);
             case DOCKER:
+            case DOCKER_UBI:
                 // nothing, "installing" docker image is running it
                 return Shell.NO_OP;
             default:
@@ -309,6 +311,7 @@ public void stopElasticsearch() throws Exception {
                 Packages.stopElasticsearch(sh);
                 break;
             case DOCKER:
+            case DOCKER_UBI:
                 // nothing, "installing" docker image is running it
                 break;
             default:
@@ -328,6 +331,7 @@ public void awaitElasticsearchStartup(Shell.Result result) throws Exception {
                 Packages.assertElasticsearchStarted(sh, installation);
                 break;
             case DOCKER:
+            case DOCKER_UBI:
                 Docker.waitForElasticsearchToStart();
                 break;
             default: