Skip to content

Commit 0f9fed8

Browse files
rjeberhardrjeberhard
authored
Merge branch 'develop' into fmw-infra
2 parents dec5972 + 942bb7e commit 0f9fed8

File tree

28 files changed

+946
-192
lines changed

28 files changed

+946
-192
lines changed

‎docs-source/content/developerguide/documentation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ update to the documentation, follow this process:
2525
3. Make your documentation updates by editing the source files in
2626
`docs-source/content`.
2727
{{% notice note %}}
28-
Make sure you _only_ check in the changes from the `docs-source/content` area;
28+
Make sure you check in the changes from the `docs-source/content` area _only_;
2929
do not build the site and check in the static files.
3030
{{% /notice %}}
3131
3232
4. If you wish to view your changes, you can run the site locally using
33-
these commands; the site will be available on the URL shown here:
33+
these commands. The site will be available on the URL shown here:
3434
3535
```
3636
cd docs-source

‎docs-source/content/userguide/introduction/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Detailed instructions are available [here]({{< relref "/userguide/managing-opera
2929

3030
### OpenShift
3131

32-
Operator 2.0.1+ is certified for use on OpenShift 3.11.43+, with Kubernetes 1.11.5+
32+
Operator 2.0.1+ is certified for use on OpenShift 3.11.43+, with Kubernetes 1.11.5+.
3333

3434
When using the operator in OpenShift, the anyuid security context constraint is required to ensure that WebLogic containers run with a UNIX UID that has the correct permissions on the domain filesystem.
3535

‎integration-tests/pom.xml

Lines changed: 141 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright 2018, Oracle Corporation and/or its affiliates. All rights
1+
<!-- Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights
22
reserved. -->
33
<!-- Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl. -->
44
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -25,6 +25,12 @@
2525
<url>https://github.com/oracle/weblogic-kubernetes-operator/blob/master/LICENSE</url>
2626
</license>
2727
</licenses>
28+
29+
<properties>
30+
<src-integration-test>${project.basedir}/src/test/java</src-integration-test>
31+
<resource-integration-test>${project.basedir}/src/test/resources</resource-integration-test>
32+
</properties>
33+
2834
<dependencies>
2935
<!-- test dependencies -->
3036
<dependency>
@@ -61,7 +67,7 @@
6167
<artifactId>guava</artifactId>
6268
<version>${guava-version}</version>
6369
</dependency>
64-
<!-- JSON processing: jackson -->
70+
<!-- JSON processing: jackson -->
6571
<dependency>
6672
<groupId>com.fasterxml.jackson.core</groupId>
6773
<artifactId>jackson-core</artifactId>
@@ -173,6 +179,9 @@
173179
<groupId>org.apache.maven.plugins</groupId>
174180
<artifactId>maven-surefire-plugin</artifactId>
175181
<version>${maven-surefire-plugin-version}</version>
182+
<configuration>
183+
<skipTests>true</skipTests>
184+
</configuration>
176185
</plugin>
177186
<plugin>
178187
<groupId>org.apache.maven.plugins</groupId>
@@ -224,122 +233,145 @@
224233
<artifactId>jacoco-maven-plugin</artifactId>
225234
<version>${jacoco.version}</version>
226235
</plugin>
236+
<plugin>
237+
<groupId>org.codehaus.mojo</groupId>
238+
<artifactId>exec-maven-plugin</artifactId>
239+
<version>1.6.0</version>
240+
<executions>
241+
<execution>
242+
<goals>
243+
<goal>java</goal>
244+
</goals>
245+
<configuration>
246+
<skip>${skipITs}</skip>
247+
</configuration>
248+
</execution>
249+
<execution>
250+
<id>setupenv</id>
251+
<phase>pre-integration-test</phase>
252+
<goals>
253+
<goal>exec</goal>
254+
</goals>
255+
<configuration>
256+
<environmentVariables>
257+
<JRF_ENABLED>${jrf_enabled}</JRF_ENABLED>
258+
</environmentVariables>
259+
<skip>${skipITs}</skip>
260+
<executable>${resource-integration-test}/setupenv.sh</executable>
261+
</configuration>
262+
</execution>
263+
</executions>
264+
</plugin>
265+
<plugin>
266+
<groupId>org.codehaus.mojo</groupId>
267+
<artifactId>build-helper-maven-plugin</artifactId>
268+
<version>3.0.0</version>
269+
<executions>
270+
<execution>
271+
<id>add-test-source</id>
272+
<phase>generate-test-resources</phase>
273+
<goals>
274+
<goal>add-test-source</goal>
275+
</goals>
276+
<configuration>
277+
<sources>
278+
<source>${src-integration-test}</source>
279+
</sources>
280+
</configuration>
281+
</execution>
282+
<execution>
283+
<id>add-test-resource</id>
284+
<phase>generate-test-resources</phase>
285+
<goals>
286+
<goal>add-test-resource</goal>
287+
</goals>
288+
<configuration>
289+
<resources>
290+
<resource>
291+
<directory>${resource-integration-test}</directory>
292+
</resource>
293+
</resources>
294+
</configuration>
295+
</execution>
296+
</executions>
297+
</plugin>
298+
299+
<plugin>
300+
<groupId>org.apache.maven.plugins</groupId>
301+
<artifactId>maven-failsafe-plugin</artifactId>
302+
<version>${maven-failsafe-plugin-version}</version>
303+
<configuration>
304+
<argLine>
305+
--illegal-access=permit
306+
</argLine>
307+
<encoding>UTF-8</encoding>
308+
<argLine>
309+
--illegal-access=permit
310+
</argLine>
311+
<argLine>${failsafeArgLine}</argLine>
312+
<failIfNoTests>false</failIfNoTests>
313+
<systemPropertyVariables>
314+
<maxThreads>3</maxThreads>
315+
</systemPropertyVariables>
316+
<additionalClasspathElements>
317+
<additionalClasspathElement>${project.basedir}/src/test/resources/wlthint3client.jar</additionalClasspathElement>
318+
</additionalClasspathElements>
319+
<includes>
320+
<include>
321+
${includes-failsafe}
322+
</include>
323+
</includes>
324+
</configuration>
325+
326+
<executions>
327+
<execution>
328+
<id>integration-tests</id>
329+
<goals>
330+
<goal>integration-test</goal>
331+
<goal>verify</goal>
332+
</goals>
333+
<phase>integration-test</phase>
334+
<configuration>
335+
<skipTests>${skipITs}</skipTests>
336+
<systemPropertyVariables>
337+
<java.util.logging.SimpleFormatter.format>%1$tm-%1$td-%1$tY %1$tH:%1$tM:%1$tS %4$-6s %2$s %5$s%6$s%n</java.util.logging.SimpleFormatter.format>
338+
</systemPropertyVariables>
339+
<trimStackTrace>false</trimStackTrace>
340+
</configuration>
341+
</execution>
342+
</executions>
343+
</plugin>
227344
</plugins>
228345
</build>
229346

230347
<profiles>
231-
232348
<profile>
233349
<id>java-integration-tests</id>
234350
<properties>
235-
<src-integration-test>${project.basedir}/src/test/java</src-integration-test>
236-
<resource-integration-test>${project.basedir}/src/test/resources</resource-integration-test>
237351
<skipITs>false</skipITs>
352+
<includes-failsafe>**/IT*</includes-failsafe>
353+
<jrf_enabled>false</jrf_enabled>
354+
</properties>
355+
</profile>
356+
<profile>
357+
<id>jrf-integration-tests</id>
358+
<properties>
359+
<skipITs>false</skipITs>
360+
<includes-failsafe>**/JrfInOperatorTest.java</includes-failsafe>
361+
<jrf_enabled>true</jrf_enabled>
362+
</properties>
363+
</profile>
364+
<profile>
365+
<id>default</id>
366+
<activation>
367+
<activeByDefault>true</activeByDefault>
368+
</activation>
369+
<properties>
370+
<surefireArgLine></surefireArgLine>
371+
<failsafeArgLine></failsafeArgLine>
372+
<skipITs>true</skipITs>
373+
<jrf_enabled>false</jrf_enabled>
238374
</properties>
239-
<build>
240-
<plugins>
241-
<plugin>
242-
<groupId>org.codehaus.mojo</groupId>
243-
<artifactId>exec-maven-plugin</artifactId>
244-
<version>${exec-maven-plugin-version}</version>
245-
<executions>
246-
<execution>
247-
<goals>
248-
<goal>java</goal>
249-
</goals>
250-
</execution>
251-
<execution><!-- pull or build images, create secrets, etc -->
252-
<id>setupenv</id>
253-
<phase>pre-integration-test</phase>
254-
<goals>
255-
<goal>exec</goal>
256-
</goals>
257-
<configuration>
258-
<executable>${resource-integration-test}/setupenv.sh</executable>
259-
</configuration>
260-
</execution>
261-
</executions>
262-
</plugin>
263-
<plugin>
264-
<groupId>org.codehaus.mojo</groupId>
265-
<artifactId>build-helper-maven-plugin</artifactId>
266-
<version>3.0.0</version>
267-
<executions>
268-
<execution>
269-
<id>add-test-source</id>
270-
<phase>generate-test-resources</phase>
271-
<goals>
272-
<goal>add-test-source</goal>
273-
</goals>
274-
<configuration>
275-
<sources>
276-
<source>${src-integration-test}</source>
277-
</sources>
278-
</configuration>
279-
</execution>
280-
<execution>
281-
<id>add-test-resource</id>
282-
<phase>generate-test-resources</phase>
283-
<goals>
284-
<goal>add-test-resource</goal>
285-
</goals>
286-
<configuration>
287-
<resources>
288-
<resource>
289-
<directory>${resource-integration-test}</directory>
290-
</resource>
291-
</resources>
292-
</configuration>
293-
</execution>
294-
</executions>
295-
</plugin>
296-
297-
<plugin>
298-
<groupId>org.apache.maven.plugins</groupId>
299-
<artifactId>maven-failsafe-plugin</artifactId>
300-
<version>${maven-failsafe-plugin-version}</version>
301-
<configuration> <!-- run tests in parallel -->
302-
<argLine>
303-
--illegal-access=permit
304-
</argLine>
305-
<encoding>UTF-8</encoding>
306-
<argLine>
307-
--illegal-access=permit
308-
</argLine>
309-
<failIfNoTests>false</failIfNoTests>
310-
<systemPropertyVariables>
311-
<!-- Add any system properties here -->
312-
<!--<project.build.directory>${project.build.directory}</project.build.directory> -->
313-
<!--<weblogic.operator.root.directory>${basedir}/..</weblogic.operator.root.directory> -->
314-
<!--<TAGS>${env.TAGS}</TAGS> -->
315-
<maxThreads>3</maxThreads>
316-
</systemPropertyVariables>
317-
<additionalClasspathElements>
318-
<additionalClasspathElement>${project.basedir}/src/test/resources/wlthint3client.jar</additionalClasspathElement>
319-
</additionalClasspathElements>
320-
</configuration>
321-
322-
<executions>
323-
<execution>
324-
<id>integration-tests</id>
325-
<goals>
326-
<goal>integration-test</goal>
327-
<goal>verify</goal>
328-
</goals>
329-
<phase>integration-test</phase>
330-
<configuration>
331-
<skipTests>${skipITs}</skipTests>
332-
<systemPropertyVariables>
333-
<!-- Set JUL Formatting -->
334-
<java.util.logging.SimpleFormatter.format>%1$tm-%1$td-%1$tY %1$tH:%1$tM:%1$tS %4$-6s %2$s %5$s%6$s%n</java.util.logging.SimpleFormatter.format>
335-
</systemPropertyVariables>
336-
<trimStackTrace>false</trimStackTrace>
337-
</configuration>
338-
</execution>
339-
</executions>
340-
</plugin>
341-
</plugins>
342-
</build>
343375
</profile>
344376
</profiles>
345377
</project>

0 commit comments

Comments
 (0)