Skip to content

Commit 4c442c3

Browse files
sankarpnrjeberhard
sankarpn
authored and
rjeberhard
committed
Fix kind-sequential nightly run failures
1 parent 7bb84e6 commit 4c442c3

File tree

7 files changed

+48
-62
lines changed

7 files changed

+48
-62
lines changed

‎Jenkinsfile.podman‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ EOF
569569
echo "-DWLSIMG_BUILDER=\"podman\"" >> ${WORKSPACE}/.mvn/maven.config
570570
echo "-Dwko.it.remoteconsole.version=\"${REMOTECONSOLE_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
571571
echo "-Djdk.httpclient.allowRestrictedHeaders=\"host\"" >> ${WORKSPACE}/.mvn/maven.config
572-
echo "-Dinstall.weblogic=\"true\"" >> ${WORKSPACE}/.mvn/maven.config
572+
echo "-Dwko.it.install.weblogic=\"true\"" >> ${WORKSPACE}/.mvn/maven.config
573573

574574
echo "${WORKSPACE}/.mvn/maven.config contents:"
575575
cat "${WORKSPACE}/.mvn/maven.config"
@@ -589,7 +589,6 @@ EOF
589589
export TEST_IMAGES_REPO_USERNAME="${OCIR_USER}"
590590
export TEST_IMAGES_REPO_PASSWORD="${OCIR_PASS}"
591591
export TEST_IMAGES_REPO_EMAIL="noreply@oracle.com"
592-
export SHIPHOME_DOWNLOAD_SERVER="home.us.oracle.com"
593592
if ! time mvn -pl integration-tests -P ${MAVEN_PROFILE_NAME} verify 2>&1 | tee "${result_root}/kindtest.log"; then
594593
echo "integration-tests failed"
595594
exit 1

‎integration-tests/pom.xml‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -765,41 +765,5 @@
765765
<groups>toolkits-srg</groups>
766766
</properties>
767767
</profile>
768-
<!-- Profile for integration test environment -->
769-
<profile>
770-
<id>integration-test-env</id>
771-
<!-- This profile is activated only if 'install.weblogic' property is set to 'true' -->
772-
<activation>
773-
<property>
774-
<name>install.weblogic</name>
775-
<value>true</value>
776-
</property>
777-
</activation>
778-
<build>
779-
<plugins>
780-
<plugin>
781-
<groupId>org.codehaus.mojo</groupId>
782-
<artifactId>exec-maven-plugin</artifactId>
783-
<executions>
784-
<execution>
785-
<id>run-silent-install-script</id>
786-
<phase>pre-integration-test</phase>
787-
<goals>
788-
<goal>exec</goal>
789-
</goals>
790-
<configuration>
791-
<executable>bash</executable>
792-
<arguments>
793-
<argument>${project.basedir}/src/test/resources/bash-scripts/install-wls.sh</argument>
794-
<argument>${wko.it.result.root}</argument>
795-
<argument>${wko.it.shiphome.download.server}</argument>
796-
</arguments>
797-
</configuration>
798-
</execution>
799-
</executions>
800-
</plugin>
801-
</plugins>
802-
</build>
803-
</profile>
804768
</profiles>
805769
</project>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
5050
import static oracle.weblogic.kubernetes.TestConstants.IT_ONPREMCRDOMAINTX_INGRESS_HTTP_NODEPORT;
5151
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
52-
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_BASE;
5352
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
5453
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
5554
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
@@ -449,10 +448,10 @@ private static void createDomainResource(String domainUid, String domNamespace,
449448
private static void createOnPremDomain() throws IOException, InterruptedException {
450449
logger.info("creating on premise domain");
451450
Path createDomainScript = downloadAndInstallWDT();
452-
mwHome = Path.of(RESULTS_BASE, "mwhome");
451+
mwHome = Path.of(RESULTS_ROOT, "mwhome");
453452
String modelFileList = RESOURCE_DIR + "/onpremcrtx/" + WDT_MODEL_FILE_DOMAIN2 + ","
454453
+ RESOURCE_DIR + "/onpremcrtx/" + WDT_MODEL_FILE_JMS2;
455-
domainHome = Path.of(RESULTS_BASE, "mwhome", "domains", "domain2");
454+
domainHome = Path.of(RESULTS_ROOT, "mwhome", "domains", "domain2");
456455
logger.info("creating on premise domain home {0}", domainHome);
457456
Files.createDirectories(domainHome);
458457
Path modelProperties = Path.of(PROPS_TEMP_DIR, WDT_MODEL_DOMAIN2_PROPS);

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,11 @@ public interface TestConstants {
477477
public static final String LARGE_DOMAIN_TESTING_PROPS_FILE =
478478
"largedomaintesting.props";
479479

480+
public static final boolean INSTALL_WEBLOGIC = Boolean.valueOf((getNonEmptySystemProperty("wko.it.install.weblogic",
481+
"false")));
482+
public static final String WEBLOGIC_SHIPHOME = getNonEmptySystemProperty("wko.it.wls.shiphome",
483+
"https://home.us.oracle.com/results/release/src141200/fmw_14.1.2.0.0_wls_generic.jar");
484+
480485
public static final String ORACLE_OPERATOR_NS = "ns-oracle-operator";
481486

482487
//node ports used by the integration tests

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_NAME;
5757
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TAG;
5858
import static oracle.weblogic.kubernetes.TestConstants.INGRESS_CLASS_FILE_NAME;
59+
import static oracle.weblogic.kubernetes.TestConstants.INSTALL_WEBLOGIC;
5960
import static oracle.weblogic.kubernetes.TestConstants.KIND_REPO;
6061
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
6162
import static oracle.weblogic.kubernetes.TestConstants.LOCALE_IMAGE_NAME;
@@ -86,6 +87,7 @@
8687
import static oracle.weblogic.kubernetes.TestConstants.WDT_BASIC_MODEL_PROPERTIES_FILE;
8788
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME;
8889
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
90+
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_SHIPHOME;
8991
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
9092
import static oracle.weblogic.kubernetes.actions.ActionConstants.ARCHIVE_DIR;
9193
import static oracle.weblogic.kubernetes.actions.ActionConstants.DOWNLOAD_DIR;
@@ -107,6 +109,7 @@
107109
import static oracle.weblogic.kubernetes.actions.TestActions.imageRepoLogin;
108110
import static oracle.weblogic.kubernetes.actions.TestActions.imageTag;
109111
import static oracle.weblogic.kubernetes.actions.TestActions.uninstallOperator;
112+
import static oracle.weblogic.kubernetes.actions.impl.primitive.Command.defaultCommandParams;
110113
import static oracle.weblogic.kubernetes.assertions.TestAssertions.doesImageExist;
111114
import static oracle.weblogic.kubernetes.assertions.TestAssertions.imageExists;
112115
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
@@ -329,6 +332,9 @@ public void beforeAll(ExtensionContext context) {
329332
logger.info("Installing istio before any test suites are run");
330333
installIstio();
331334
}
335+
if (INSTALL_WEBLOGIC && !OKD && !CRIO && !ARM && !OKE_CLUSTER) {
336+
installOnPremWebLogic();
337+
}
332338
} finally {
333339
// Initialization is done. Release all waiting other threads. The latch is now disabled so
334340
// other threads
@@ -702,4 +708,16 @@ private void installOracleDBOperator() {
702708
assertDoesNotThrow(() -> installDBOperator(), "Failed to install database operator");
703709
}
704710

711+
private void installOnPremWebLogic() {
712+
Path installScript = Paths.get(RESOURCE_DIR, "bash-scripts", "install-wls.sh");
713+
String command
714+
= String.format("%s %s %s %s", "/bin/bash", installScript, RESULTS_ROOT, WEBLOGIC_SHIPHOME);
715+
getLogger().info("WebLogic installation command {0}", command);
716+
assertTrue(() -> Command.withParams(
717+
defaultCommandParams()
718+
.command(command)
719+
.redirect(false))
720+
.execute());
721+
}
722+
705723
}

‎integration-tests/src/test/resources/bash-scripts/install-istio.sh‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,18 @@ ${KUBERNETES_CLI} delete namespace istio-system --ignore-not-found
3333
# create the namespace 'istio-system'
3434
${KUBERNETES_CLI} create namespace istio-system
3535

36-
( cd $workdir;
37-
oci os object get --namespace=${wko_tenancy} --bucket-name=wko-system-test-files \
38-
--name=istio/istio-${version}-${arch}.tar.gz --file=istio.tar.gz \
39-
--auth=instance_principal
36+
( cd $workdir
37+
if [ -z "$JENKINS_HOME" ]; then
38+
# Not in Jenkins, download using curl
39+
echo "Detected local environment. Downloading Istio using curl."
40+
curl -Lo istio.tar.gz https://github.com/istio/istio/releases/download/${version}/istio-${version}-${arch}.tar.gz
41+
else
42+
# Running in Jenkins, download using OCI CLI
43+
echo "Detected Jenkins environment. Downloading Istio using OCI CLI."
44+
oci os object get --namespace=${wko_tenancy} --bucket-name=wko-system-test-files \
45+
--name=istio/istio-${version}-${arch}.tar.gz --file=istio.tar.gz \
46+
--auth=instance_principal
47+
fi
4048
tar zxf istio.tar.gz
4149
)
4250

‎integration-tests/src/test/resources/bash-scripts/install-wls.sh‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,29 @@
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44

55
echo $JAVA_HOME
6-
if [ -n "$1" ] || [ -n "$result_root" ]; then
7-
echo "RESULT_ROOT or result_root is set"
6+
if [ -n "$1" ]; then
7+
echo "RESULT_ROOT is set"
8+
result_root=$1
89
else
9-
echo "no RESULT_ROOT or result_root is set, exiting wls installation."
10+
echo "no RESULT_ROOT is set, exiting wls installation."
1011
exit 0
1112
fi
1213

13-
if [ -n "$2" ] || [ -n "$SHIPHOME_DOWNLOAD_SERVER" ]; then
14-
echo "SHIPHOME_DOWNLOAD_SERVER is set"
14+
if [ -n "$2" ]; then
15+
echo "WEBLOGIC_SHIPHOME is set"
16+
shiphome_url=$2
1517
else
16-
echo "no SHIPHOME_DOWNLOAD_SERVER is set, exiting wls installation."
18+
echo "no WEBLOGIC_SHIPHOME is set, exiting wls installation."
1719
exit 0
1820
fi
1921

20-
if [ -z "$1" ]; then
21-
echo "running in Jenkins, result_root is set"
22-
else
23-
echo "running in localhost, RESULT_ROOT is set : $1"
24-
result_root=$1
25-
SHIPHOME_DOWNLOAD_SERVER=$2
26-
27-
fi
2822
echo $result_root
29-
echo $SHIPHOME_DOWNLOAD_SERVER
23+
echo $shiphome_url
3024
MW_HOME="$result_root/mwhome"
3125
SILENT_RESPONSE_FILE=$result_root/silent.response
3226
ORAINVENTORYPOINTER_LOC=$result_root/oraInv.loc
3327
ORAINVENTORY_LOC=$result_root/oraInventory
3428
WLS_SHIPHOME=$result_root/fmw_wls_generic.jar
35-
DOWNLOAD_URL="http://$SHIPHOME_DOWNLOAD_SERVER/results/release/src141200/fmw_14.1.2.0.0_wls_generic.jar"
3629
SUCCESS="The\ installation\ of\ Oracle\ Fusion\ Middleware.*completed\ successfully"
3730

3831
rm -rf $MW_HOME/*
@@ -64,7 +57,7 @@ EOF
6457
cat $ORAINVENTORYPOINTER_LOC
6558

6659
#download WebLogic shiphome installer
67-
curl -Lo $WLS_SHIPHOME $DOWNLOAD_URL
60+
curl -Lo $WLS_SHIPHOME $shiphome_url
6861
ls -l $WLS_SHIPHOME
6962
md5sum $WLS_SHIPHOME
7063

0 commit comments

Comments
 (0)