From 44c7825431e7efc96d76859cf0d33b22ca43d034 Mon Sep 17 00:00:00 2001
From: maggie_he <maggie.he@oracle.com>
Date: Fri, 1 Dec 2023 18:54:58 +0000
Subject: [PATCH] Enable release/3.4 nightly run weekly

---
 Jenkinsfile.kindnightly                                       | 4 ++--
 .../weblogic/kubernetes/ItConfigDistributionStrategy.java     | 2 --
 .../oracle/weblogic/kubernetes/ItIstioMonitoringExporter.java | 2 --
 .../weblogic/kubernetes/ItMonitoringExporterSideCar.java      | 2 --
 .../test/java/oracle/weblogic/kubernetes/ItRemoteConsole.java | 2 --
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/Jenkinsfile.kindnightly b/Jenkinsfile.kindnightly
index 537630174ab..34976b5f9d5 100644
--- 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
index 412a59a76e9..b83fcc2c74b 100644
--- 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
index b1e475ee4f1..7ef5010f172 100644
--- 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
index 512a7e7e0f6..9e2133f8cea 100644
--- 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
index c1caef15f77..3689f1c7025 100644
--- 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 {