Skip to content
This repository has been archived by the owner on May 18, 2020. It is now read-only.

Rename tests, parallel tests, one elasticsearch replica, readiness probe #50

Merged
merged 15 commits into from
Oct 17, 2017
Merged

Rename tests, parallel tests, one elasticsearch replica, readiness probe #50

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ed8c948
Rename tests, minor refactor
pavolloffay Oct 11, 2017
a37154b
Remove unused import
pavolloffay Oct 11, 2017
a7b0d6d
Add docker service to travis
pavolloffay Oct 11, 2017
7888085
Bumb nsenter
pavolloffay Oct 11, 2017
5e10cae
Ignore cassandra test
pavolloffay Oct 11, 2017
44bc9b3
Run tests in parallel
pavolloffay Oct 11, 2017
8f4986d
wait fixed time before ES tests
pavolloffay Oct 12, 2017
517f0e8
Increase wait time
pavolloffay Oct 12, 2017
1ad7292
increase memory and CPU for minikube
pavolloffay Oct 12, 2017
7773667
restrict ES heap
pavolloffay Oct 12, 2017
46cf417
increase minimum mem and use newer ES image
pavolloffay Oct 12, 2017
ade5365
Use one elastic replica
pavolloffay Oct 12, 2017
0863a74
revert minikube changes
pavolloffay Oct 12, 2017
5327cc7
Remove sleep
pavolloffay Oct 16, 2017
3af67a6
Readiness probe for ES
pavolloffay Oct 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion production-elasticsearch/src/test/java/io/jaegertracing/kubernetes/ElasticearchETest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import io.jaegertracing.kubernetes.deployment.BaseETest;
import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import okhttp3.Request;
import okhttp3.Response;
import org.junit.Before;
Expand All @@ -35,7 +36,9 @@ public class ElasticearchETest extends BaseETest {
* 2. jaeger-query returns 500 is ES storage is empty (without indices) https://github.com/jaegertracing/jaeger/issues/464
*/
@Before
public void before() {
public void before() throws InterruptedException {
TimeUnit.SECONDS.sleep(8);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR is not ready for review, right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not ready, it is still failing


String serviceName = UUID.randomUUID().toString().replace("-", "");
Tracer tracer = createJaegerTracer(serviceName);
String operationName = UUID.randomUUID().toString().replace("-", "");
Expand Down