honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix PackagingTestCase for DOCKER_UBI variant

This commit is contained in:
Rory Hunter 2020-08-18 16:12:03 +01:00
parent bd7236cd65
commit d0c57c3068
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/os/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java
View File

@ -220,6 +220,7 @@ public abstract class PackagingTestCase extends Assert {
Packages.verifyPackageInstallation(installation, distribution, sh); Packages.verifyPackageInstallation(installation, distribution, sh);
break; break;
case DOCKER: case DOCKER:
case DOCKER_UBI:
installation = Docker.runContainer(distribution); installation = Docker.runContainer(distribution);
Docker.verifyContainerInstallation(installation, distribution); Docker.verifyContainerInstallation(installation, distribution);
break; break;
@ -295,6 +296,7 @@ public abstract class PackagingTestCase extends Assert {
case RPM: case RPM:
return Packages.runElasticsearchStartCommand(sh); return Packages.runElasticsearchStartCommand(sh);
case DOCKER: case DOCKER:
case DOCKER_UBI:
// nothing, "installing" docker image is running it // nothing, "installing" docker image is running it
return Shell.NO_OP; return Shell.NO_OP;
default: default:
@ -313,6 +315,7 @@ public abstract class PackagingTestCase extends Assert {
Packages.stopElasticsearch(sh); Packages.stopElasticsearch(sh);
break; break;
case DOCKER: case DOCKER:
case DOCKER_UBI:
// nothing, "installing" docker image is running it // nothing, "installing" docker image is running it
break; break;
default: default:
@ -332,6 +335,7 @@ public abstract class PackagingTestCase extends Assert {
Packages.assertElasticsearchStarted(sh, installation); Packages.assertElasticsearchStarted(sh, installation);
break; break;
case DOCKER: case DOCKER:
case DOCKER_UBI:
Docker.waitForElasticsearchToStart(); Docker.waitForElasticsearchToStart();
break; break;
default: default: