Add Mp61 Telemetry 2 FAT repeats to mptelemetry_container_fat bucket

OpenLiberty · Oct 1, 2024 · 5194d1a · 5194d1a
1 parent 9201a80
commit 5194d1a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/...iner_fat/fat/src/io/openliberty/microprofile/telemetry/internal/tests/JaegerBaseTest.java b/...iner_fat/fat/src/io/openliberty/microprofile/telemetry/internal/tests/JaegerBaseTest.java
@@ -75,7 +75,7 @@ public abstract class JaegerBaseTest {
     protected abstract JaegerQueryClient getJaegerClient();
 
     @Test
-    @SkipForRepeat({ TelemetryActions.MP14_MPTEL20_ID, TelemetryActions.MP41_MPTEL20_ID, TelemetryActions.MP50_MPTEL20_ID, TelemetryActions.MP50_MPTEL20_JAVA8_ID, MicroProfileActions.MP70_EE10_ID, MicroProfileActions.MP70_EE11_ID})
+    @SkipForRepeat({ TelemetryActions.MP14_MPTEL20_ID, TelemetryActions.MP41_MPTEL20_ID, TelemetryActions.MP50_MPTEL20_ID, TelemetryActions.MP50_MPTEL20_JAVA8_ID, TelemetryActions.MP61_MPTEL20_ID, MicroProfileActions.MP70_EE10_ID, MicroProfileActions.MP70_EE11_ID})
     public void testBasicTelemetry1() throws Exception {
         HttpRequest request = new HttpRequest(server, "/spanTest");
         String traceId = request.run(String.class);

diff --git a/...fat/src/io/openliberty/microprofile/telemetry/internal/tests/ZipkinOtelCollectorTest.java b/...fat/src/io/openliberty/microprofile/telemetry/internal/tests/ZipkinOtelCollectorTest.java
@@ -119,7 +119,7 @@ public static void teardown() throws Exception {
 
     @Test
     @SkipForRepeat({ TelemetryActions.MP14_MPTEL20_ID, TelemetryActions.MP41_MPTEL20_ID, TelemetryActions.MP50_MPTEL20_ID, TelemetryActions.MP50_MPTEL20_JAVA8_ID,
-                     MicroProfileActions.MP70_EE10_ID, MicroProfileActions.MP70_EE11_ID })
+                     TelemetryActions.MP61_MPTEL20_ID, MicroProfileActions.MP70_EE10_ID, MicroProfileActions.MP70_EE11_ID })
     public void testBasicTelemetry1() throws Exception {
         HttpRequest request = new HttpRequest(server, "/spanTest");
 

diff --git a/...ontainer_fat/fat/src/io/openliberty/microprofile/telemetry/internal/tests/ZipkinTest.java b/...ontainer_fat/fat/src/io/openliberty/microprofile/telemetry/internal/tests/ZipkinTest.java
@@ -102,7 +102,7 @@ public static void teardown() throws Exception {
 
     @Test
     @SkipForRepeat({ TelemetryActions.MP14_MPTEL20_ID, TelemetryActions.MP41_MPTEL20_ID, TelemetryActions.MP50_MPTEL20_ID, TelemetryActions.MP50_MPTEL20_JAVA8_ID,
-                     MicroProfileActions.MP70_EE10_ID, MicroProfileActions.MP70_EE11_ID })
+                     TelemetryActions.MP61_MPTEL20_ID, MicroProfileActions.MP70_EE10_ID, MicroProfileActions.MP70_EE11_ID })
     public void testBasicTelemetry1() throws Exception {
         HttpRequest request = new HttpRequest(server, "/spanTest");
         String traceId = request.run(String.class);

diff --git a/...ommon/src/io/openliberty/microprofile/telemetry/internal_fat/shared/TelemetryActions.java b/...ommon/src/io/openliberty/microprofile/telemetry/internal_fat/shared/TelemetryActions.java
@@ -139,7 +139,7 @@ public static RepeatTests telemetry10and11Repeats(String serverName) {
 
     public static RepeatTests telemetry20Repeats(String serverName) {
         return repeat(serverName, MicroProfileActions.MP70_EE11, MP14_MPTEL20, MP41_MPTEL20, MP50_MPTEL20,
-                      MP50_MPTEL20_JAVA8, MicroProfileActions.MP70_EE10);
+                      MP50_MPTEL20_JAVA8, MP61_MPTEL20, MicroProfileActions.MP70_EE10);
     }
 
     public static RepeatTests telemetry20Repeats() {
@@ -154,7 +154,6 @@ public static RepeatTests latestTelemetryRepeats(String serverName) {
         return repeat(serverName,
                       MicroProfileActions.MP70_EE11,
                       MicroProfileActions.MP70_EE10,
-                      MP61_MPTEL20,
                       MicroProfileActions.MP61,
                       MicroProfileActions.MP60);
     }