Skip to content

Commit ba8f354

Browse files
robertpatrickrobertpatrick
authored
first pass at IT framework upgrade and Jenkinsfile (#2906)
* first pass at IT framework upgrade and Jenkinsfile * removing unused imports * defining sonar.organization property in root POM file
1 parent f22dd54 commit ba8f354

32 files changed

+1086
-217
lines changed

‎Jenkinsfile

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

‎integration-tests/pom.xml

Lines changed: 157 additions & 6 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_APP_NAME;
4040
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_CHART_DIR;
4141
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME;
42+
import static oracle.weblogic.kubernetes.TestConstants.SKIP_CLEANUP;
4243
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_INDEX_KEY;
4344
import static oracle.weblogic.kubernetes.TestConstants.WLS_LOGGING_EXPORTER_YAML_FILE_NAME;
4445
import static oracle.weblogic.kubernetes.actions.ActionConstants.DOWNLOAD_DIR;
@@ -222,9 +223,7 @@ public static void init(@Namespaces(3) List<String> namespaces) {
222223
*/
223224
@AfterAll
224225
void tearDown() {
225-
if (System.getenv("SKIP_CLEANUP") == null
226-
|| (System.getenv("SKIP_CLEANUP") != null
227-
&& System.getenv("SKIP_CLEANUP").equalsIgnoreCase("false"))) {
226+
if (!SKIP_CLEANUP) {
228227

229228
// uninstall ELK Stack
230229
elasticsearchParams = new LoggingExporterParams()

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_CHART_DIR;
7373
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME;
7474
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
75+
import static oracle.weblogic.kubernetes.TestConstants.SKIP_CLEANUP;
7576
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
7677
import static oracle.weblogic.kubernetes.actions.TestActions.execCommand;
7778
import static oracle.weblogic.kubernetes.actions.TestActions.getOperatorPodName;
@@ -230,9 +231,7 @@ public static void init(@Namespaces(3) List<String> namespaces) {
230231
*/
231232
@AfterAll
232233
void tearDown() {
233-
if (System.getenv("SKIP_CLEANUP") == null
234-
|| (System.getenv("SKIP_CLEANUP") != null
235-
&& System.getenv("SKIP_CLEANUP").equalsIgnoreCase("false"))) {
234+
if (!SKIP_CLEANUP) {
236235

237236
elasticsearchParams = new LoggingExporterParams()
238237
.elasticsearchName(ELASTICSEARCH_NAME)

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import static oracle.weblogic.kubernetes.TestConstants.OCIR_SECRET_NAME;
5454
import static oracle.weblogic.kubernetes.TestConstants.OKD;
5555
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
56+
import static oracle.weblogic.kubernetes.TestConstants.SKIP_CLEANUP;
5657
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_RELEASE_NAME;
5758
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_SLIM;
5859
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
@@ -687,9 +688,7 @@ private static Callable<Boolean> runJmsClient(String javaCmd) {
687688

688689
@AfterAll
689690
public void tearDownAll() {
690-
if (System.getenv("SKIP_CLEANUP") == null
691-
|| (System.getenv("SKIP_CLEANUP") != null
692-
&& System.getenv("SKIP_CLEANUP").equalsIgnoreCase("false"))) {
691+
if (!SKIP_CLEANUP) {
693692

694693
// uninstall Traefik loadbalancer
695694
if (traefikHelmParams != null) {

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
5050
import static oracle.weblogic.kubernetes.TestConstants.OCIR_SECRET_NAME;
5151
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
52+
import static oracle.weblogic.kubernetes.TestConstants.SKIP_CLEANUP;
5253
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_SLIM;
5354
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
5455
import static oracle.weblogic.kubernetes.actions.TestActions.createDomainCustomResource;
@@ -348,9 +349,7 @@ private static Callable<Boolean> runJmsClient(String javaCmd) {
348349

349350
@AfterAll
350351
public void tearDownAll() {
351-
if (System.getenv("SKIP_CLEANUP") == null
352-
|| (System.getenv("SKIP_CLEANUP") != null
353-
&& System.getenv("SKIP_CLEANUP").equalsIgnoreCase("false"))) {
352+
if (!SKIP_CLEANUP) {
354353
StringBuffer removeNodePort = new StringBuffer("kubectl delete -f ");
355354
removeNodePort.append(Paths.get(RESULTS_ROOT, "cluster.nodeport.svc.yaml"));
356355
assertDoesNotThrow(() -> exec(new String(removeNodePort), true));

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2021, Oracle and/or its affiliates.
1+
// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.weblogic.kubernetes;
@@ -28,7 +28,10 @@
2828
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
2929
import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TO_USE_IN_SPEC;
3030
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
31+
import static oracle.weblogic.kubernetes.TestConstants.HTTPS_PROXY;
32+
import static oracle.weblogic.kubernetes.TestConstants.HTTP_PROXY;
3133
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
34+
import static oracle.weblogic.kubernetes.TestConstants.NO_PROXY;
3235
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
3336
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
3437
import static oracle.weblogic.kubernetes.actions.ActionConstants.WDT_VERSION;
@@ -239,16 +242,20 @@ private void createDomainJobOnPv(Path domainCreationScriptFile,
239242
.addEnvItem(new V1EnvVar()
240243
.name("DOMAIN_HOME_DIR")
241244
.value(DOMAINHOMEPREFIX + domainUid))
242-
.addEnvItem(new V1EnvVar()
243-
.name("http_proxy")
244-
.value(System.getenv("http_proxy")))
245-
.addEnvItem(new V1EnvVar()
246-
.name("https_proxy")
247-
.value(System.getenv("http_proxy")))
248245
.addEnvItem(new V1EnvVar()
249246
.name("DOMAIN_TYPE")
250247
.value("JRF"));
251248

249+
if (HTTP_PROXY != null) {
250+
jobCreationContainer.addEnvItem(new V1EnvVar().name("http_proxy").value(HTTP_PROXY));
251+
}
252+
if (HTTPS_PROXY != null) {
253+
jobCreationContainer.addEnvItem(new V1EnvVar().name("https_proxy").value(HTTPS_PROXY));
254+
}
255+
if (NO_PROXY != null) {
256+
jobCreationContainer.addEnvItem(new V1EnvVar().name("no_proxy").value(NO_PROXY));
257+
}
258+
252259
logger.info("Running a Kubernetes job to create the domain");
253260
createDomainJob(FMWINFRA_IMAGE_TO_USE_IN_SPEC, pvName, pvcName, domainScriptConfigMapName,
254261
domainNamespace, jobCreationContainer);

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossClusters.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TO_USE_IN_SPEC;
5252
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
5353
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_VERSION;
54+
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST1;
55+
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST2;
5456
import static oracle.weblogic.kubernetes.TestConstants.OCIR_SECRET_NAME;
5557
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
5658
import static oracle.weblogic.kubernetes.actions.ActionConstants.APP_DIR;
@@ -112,13 +114,6 @@ class ItIstioCrossClusters {
112114
private static LoggingFacade logger = null;
113115
static String dbUrl;
114116
static int dbNodePort;
115-
private static String K8S_NODEPORT_HOST2 = System.getenv("K8S_NODEPORT_HOST2");
116-
117-
private static String K8S_NODEPORT_HOST1 = System.getenv("K8S_NODEPORT_HOST1");
118-
119-
private static boolean TWO_CLUSTERS = Boolean.parseBoolean(java.util.Optional.ofNullable(
120-
System.getenv("TWO_CLUSTERS"))
121-
.orElse("false"));
122117

123118
/**
124119
* Install Operator, Database in cluster2.

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossClustersSetup.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
4848
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
4949
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_VERSION;
50+
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST1;
5051
import static oracle.weblogic.kubernetes.TestConstants.OCIR_SECRET_NAME;
5152
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
5253
import static oracle.weblogic.kubernetes.actions.ActionConstants.APP_DIR;
@@ -98,10 +99,6 @@ class ItIstioCrossClustersSetup {
9899
private static String domain1Image;
99100
private static LoggingFacade logger = null;
100101
static int istioIngressPort;
101-
private static String K8S_NODEPORT_HOST1 = System.getenv("K8S_NODEPORT_HOST1");
102-
private static boolean TWO_CLUSTERS = Boolean.parseBoolean(java.util.Optional.ofNullable(
103-
System.getenv("TWO_CLUSTERS"))
104-
.orElse("false"));
105102

106103
/**
107104
* Install Operator.

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesEvents.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO_SECRET;
5858
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
5959
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
60+
import static oracle.weblogic.kubernetes.TestConstants.SKIP_CLEANUP;
6061
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
6162
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
6263
import static oracle.weblogic.kubernetes.actions.TestActions.createNamespace;
@@ -943,9 +944,7 @@ void testK8SEventsStartStopWatchingNSWithDedicated() {
943944
*/
944945
@AfterAll
945946
public static void tearDown() {
946-
if (System.getenv("SKIP_CLEANUP") == null
947-
|| (System.getenv("SKIP_CLEANUP") != null
948-
&& System.getenv("SKIP_CLEANUP").equalsIgnoreCase("false"))) {
947+
if (!SKIP_CLEANUP) {
949948
deletePersistentVolumeClaim(domainNamespace1, "sample-pvc");
950949
deletePersistentVolume("sample-pv");
951950
}

0 commit comments

Comments
 (0)