Merge branch '34pro' into 'release/3.4'

Enable release/3.4 nightly run weekly See merge request weblogic-cloud/weblogic-kubernetes-operator!4512
oracle · Dec 1, 2023 · e42f282 · e42f282
2 parents 5cec8da + 44c7825
commit e42f282
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 10 deletions.
diff --git a/Jenkinsfile.kindnightly b/Jenkinsfile.kindnightly
@@ -61,7 +61,7 @@ def kind_k8s_map = [
     ]
 ]
 def _kind_image = null
-CRON_SETTINGS = '''H 1 * * * % MAVEN_PROFILE_NAME=kind-parallel'''
+CRON_SETTINGS = '''H 11 * * 6 % MAVEN_PROFILE_NAME=kind-parallel'''
 
 
 pipeline {
@@ -71,7 +71,7 @@ pipeline {
     }
     triggers {
         // timer trigger for "nightly build"
-        parameterizedCron(env.JOB_NAME == 'wko-kind-release34-nightly' ?
+        parameterizedCron(env.JOB_NAME == 'wko-kind-release34-weekly' ?
         CRON_SETTINGS : '')
     }
 

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConfigDistributionStrategy.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConfigDistributionStrategy.java
@@ -54,7 +54,6 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
@@ -124,7 +123,6 @@
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @DisplayName("Verify the overrideDistributionStrategy applies the overrides accordingly to the value set")
 @IntegrationTest
-@Tag("kind-parallel")
 class ItConfigDistributionStrategy {
 
   private static String opNamespace = null;

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMonitoringExporter.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMonitoringExporter.java
@@ -18,7 +18,6 @@
 import oracle.weblogic.kubernetes.utils.ExecResult;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
@@ -63,7 +62,6 @@
 
 @DisplayName("Test the monitoring WebLogic Domain via istio provided Prometheus")
 @IntegrationTest
-@Tag("kind-parallel")
 class ItIstioMonitoringExporter {
 
   private static String opNamespace = null;

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporterSideCar.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporterSideCar.java
@@ -26,7 +26,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 
@@ -83,7 +82,6 @@
 @DisplayName("Verify WebLogic Metric is processed as expected by "
     + "MonitoringExporter Side Car via Prometheus and Grafana")
 @IntegrationTest
-@Tag("kind-parallel")
 class ItMonitoringExporterSideCar {
 
   // domain constants

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItRemoteConsole.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItRemoteConsole.java
@@ -28,7 +28,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 
@@ -75,7 +74,6 @@
 
 @DisplayName("Test WebLogic remote console connecting to mii domain")
 @IntegrationTest
-@Tag("kind-parallel")
 @DisabledOnSlimImage
 class ItRemoteConsole {