Skip to content

Commit 0310144

Browse files
committed
Merge branch 'release34jenkins' into 'release/3.4'
adding jenkinsfile and kind-parallel profile See merge request weblogic-cloud/weblogic-kubernetes-operator!4353
2 parents 53a05e7 + 6bd90b4 commit 0310144

File tree

67 files changed

+769
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+769
-287
lines changed

Jenkinsfile.kindnightly

Lines changed: 638 additions & 0 deletions
Large diffs are not rendered by default.

integration-tests/pom.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
<wko.it.kind.repo>${env.KIND_REPO}</wko.it.kind.repo>
2525
<wko.it.test.images.repo>${env.TEST_IMAGES_REPO}</wko.it.test.images.repo>
2626
<wko.it.base.images.repo>${env.BASE_IMAGES_REPO}</wko.it.base.images.repo>
27+
<wko.it.base.images.tenancy>${env.WKO_TENANCY}</wko.it.base.images.tenancy>
28+
<wko.it.test.images.tenancy>${env.WKO_TENANCY}</wko.it.test.images.tenancy>
2729
<wko.it.weblogic.image.name>${env.WEBLOGIC_IMAGE_NAME}</wko.it.weblogic.image.name>
2830
<wko.it.weblogic.image.tag>${env.WEBLOGIC_IMAGE_TAG}</wko.it.weblogic.image.tag>
2931
<wko.it.weblogic.image.tags>${env.WEBLOGIC_IMAGE_TAGS}</wko.it.weblogic.image.tags>
@@ -130,6 +132,18 @@
130132
<message>Set the TEST_IMAGES_REPO environment variable to specify the TEST_IMAGES_REPO username to use for pulling/pushing images.</message>
131133
<variableName>TEST_IMAGES_REPO</variableName>
132134
</requireEnvironmentVariable>
135+
<requireProperty>
136+
<property>wko.it.base.images.tenancy</property>
137+
<message>Set the wko.it.base.images.tenancy property to specify the tenancy to use to pull base weblogic/fmw images.</message>
138+
<regex>^[a-zA-Z0-9_]+.*$</regex>
139+
<regexMessage>The wko.it.base.images.repo must start with an alphanumeric character</regexMessage>
140+
</requireProperty>
141+
<requireProperty>
142+
<property>wko.it.test.images.tenancy</property>
143+
<message>Set the wko.it.test.images.tenancy property to specify the tenancy to use to pull local infra images and domain images.</message>
144+
<regex>^[a-zA-Z0-9_]+.*$</regex>
145+
<regexMessage>The wko.it.test.images.repo must start with an alphanumeric character</regexMessage>
146+
</requireProperty>
133147
<requireEnvironmentVariable>
134148
<message>Set the TEST_IMAGES_REPO_USERNAME environment variable to specify the TEST_IMAGES_REPO username to use for pulling/pushing images.</message>
135149
<variableName>TEST_IMAGES_REPO_USERNAME</variableName>
@@ -239,6 +253,8 @@
239253
<wko.it.opdemo>${wko.it.opdemo}</wko.it.opdemo>
240254
<wko.it.image.name.operator>${wko.it.image.name.operator}</wko.it.image.name.operator>
241255
<wko.it.image.tag.operator>${wko.it.image.tag.operator}</wko.it.image.tag.operator>
256+
<wko.it.base.images.tenancy>${wko.it.base.images.tenancy}</wko.it.base.images.tenancy>
257+
<wko.it.test.images.tenancy>${wko.it.test.images.tenancy}</wko.it.test.images.tenancy>
242258
</systemPropertyVariables>
243259
<trimStackTrace>false</trimStackTrace>
244260
</configuration>
@@ -601,6 +617,13 @@
601617
<groups>gate,samples-gate</groups>
602618
</properties>
603619
</profile>
620+
<profile>
621+
<id>kind-parallel</id>
622+
<properties>
623+
<skipITs>false</skipITs>
624+
<groups>kind-parallel</groups>
625+
</properties>
626+
</profile>
604627
<profile>
605628
<id>crio-pipeline</id>
606629
<properties>

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCoherenceTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import oracle.weblogic.kubernetes.utils.FileUtils;
3333
import org.junit.jupiter.api.BeforeAll;
3434
import org.junit.jupiter.api.DisplayName;
35+
import org.junit.jupiter.api.Tag;
3536
import org.junit.jupiter.api.Test;
3637

3738
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
@@ -67,6 +68,7 @@
6768
*/
6869
@DisplayName("Test to create a WebLogic domain with Coherence and verify the use of Coherence cache service")
6970
@IntegrationTest
71+
@Tag("kind-parallel")
7072
class ItCoherenceTests {
7173

7274
// constants for Coherence

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConfigDistributionStrategy.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import org.junit.jupiter.api.DisplayName;
5555
import org.junit.jupiter.api.MethodOrderer;
5656
import org.junit.jupiter.api.Order;
57+
import org.junit.jupiter.api.Tag;
5758
import org.junit.jupiter.api.Test;
5859
import org.junit.jupiter.api.TestMethodOrder;
5960

@@ -123,6 +124,7 @@
123124
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
124125
@DisplayName("Verify the overrideDistributionStrategy applies the overrides accordingly to the value set")
125126
@IntegrationTest
127+
@Tag("kind-parallel")
126128
class ItConfigDistributionStrategy {
127129

128130
private static String opNamespace = null;

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.junit.jupiter.api.BeforeAll;
3737
import org.junit.jupiter.api.BeforeEach;
3838
import org.junit.jupiter.api.DisplayName;
39+
import org.junit.jupiter.api.Tag;
3940
import org.junit.jupiter.api.Test;
4041

4142
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
@@ -84,6 +85,7 @@
8485
*/
8586
@DisplayName("Verify cross domain transaction is successful")
8687
@IntegrationTest
88+
@Tag("kind-parallel")
8789
class ItCrossDomainTransaction {
8890

8991
private static final String WDT_MODEL_FILE_DOMAIN1 = "model-crossdomaintransaction-domain1.yaml";

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDataHomeOverride.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import oracle.weblogic.kubernetes.logging.LoggingFacade;
1414
import org.junit.jupiter.api.BeforeAll;
1515
import org.junit.jupiter.api.DisplayName;
16+
import org.junit.jupiter.api.Tag;
1617
import org.junit.jupiter.api.Test;
1718

1819
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE;
@@ -40,6 +41,7 @@
4041
*/
4142
@DisplayName("Verify dataHome override with different dataHome setting in the domain spec")
4243
@IntegrationTest
44+
@Tag("kind-parallel")
4345
class ItDataHomeOverride {
4446

4547
// domain constants

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLogging.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.junit.jupiter.api.BeforeAll;
2525
import org.junit.jupiter.api.Disabled;
2626
import org.junit.jupiter.api.DisplayName;
27+
import org.junit.jupiter.api.Tag;
2728
import org.junit.jupiter.api.Test;
2829
import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
2930

@@ -102,6 +103,7 @@
102103
*/
103104
@DisplayName("Test to use Elasticsearch API to query WebLogic logs")
104105
@IntegrationTest
106+
@Tag("kind-parallel")
105107
class ItElasticLogging {
106108

107109
// constants for creating domain image using model in image

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLoggingFluentd.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.junit.jupiter.api.AfterAll;
4040
import org.junit.jupiter.api.BeforeAll;
4141
import org.junit.jupiter.api.DisplayName;
42+
import org.junit.jupiter.api.Tag;
4243
import org.junit.jupiter.api.Test;
4344

4445
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
@@ -100,6 +101,7 @@
100101
*/
101102
@DisplayName("Test to use Elasticsearch API to query WebLogic logs")
102103
@IntegrationTest
104+
@Tag("kind-parallel")
103105
class ItElasticLoggingFluentd {
104106

105107
// constants for creating domain image using model in image

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItExternalLbTunneling.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.junit.jupiter.api.BeforeEach;
3838
import org.junit.jupiter.api.Disabled;
3939
import org.junit.jupiter.api.DisplayName;
40+
import org.junit.jupiter.api.Tag;
4041
import org.junit.jupiter.api.Test;
4142
import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
4243
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
@@ -105,6 +106,7 @@
105106

106107
@DisplayName("Test external RMI access through loadbalncer tunneling")
107108
@IntegrationTest
109+
@Tag("kind-parallel")
108110
@DisabledOnSlimImage
109111
class ItExternalLbTunneling {
110112

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItExternalNodePortService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.junit.jupiter.api.BeforeEach;
3535
import org.junit.jupiter.api.DisplayName;
3636
import org.junit.jupiter.api.MethodOrderer;
37+
import org.junit.jupiter.api.Tag;
3738
import org.junit.jupiter.api.Test;
3839
import org.junit.jupiter.api.TestMethodOrder;
3940

@@ -91,6 +92,7 @@
9192
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
9293
@DisplayName("Test external RMI access through NodePort tunneling")
9394
@IntegrationTest
95+
@Tag("kind-parallel")
9496
@DisabledOnSlimImage
9597
class ItExternalNodePortService {
9698

0 commit comments

Comments
 (0)