Skip to content

Wdt 638 discover fresh domain #1325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Dec 21, 2022
Merged

Wdt 638 discover fresh domain #1325

Changes from 25 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5b7f82b
Fix for flattened folders without tokens in location
CarolynRountree Oct 7, 2022
5a03cd4
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Oct 26, 2022
94f8857
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Oct 27, 2022
3466703
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Oct 27, 2022
12fa7ed
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Oct 31, 2022
12b63a7
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 15, 2022
fc56e10
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 22, 2022
499f88b
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 23, 2022
c35e6b5
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 28, 2022
98ab6f2
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 29, 2022
ed815d1
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 29, 2022
b58411e
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 30, 2022
4d646da
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Nov 30, 2022
76e2306
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 1, 2022
f968f6d
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 2, 2022
d03d4de
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 2, 2022
e79edf7
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 6, 2022
a395a3f
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 12, 2022
6eecb64
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 13, 2022
5d4ea19
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 13, 2022
f57978e
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 14, 2022
857f031
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 14, 2022
9ec4b05
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
CarolynRountree Dec 15, 2022
4123d38
create a new domain before discover
CarolynRountree Dec 16, 2022
64c63b0
create a new domain before discover
CarolynRountree Dec 16, 2022
a6c85c5
discover unique domains
CarolynRountree Dec 20, 2022
de88601
discover unique domains
CarolynRountree Dec 20, 2022
dd5109c
discover unique domains
CarolynRountree Dec 20, 2022
54279ab
discover unique domains
CarolynRountree Dec 20, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 55 additions & 8 deletions integration-tests/system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,9 +497,18 @@ void test16CreateRestrictedJRFDomain(TestInfo testInfo) throws Exception {
@Test
void test17DiscoverDomainWithRequiredArgument(TestInfo testInfo) throws Exception {
assumeTrue(new RestrictedJrfChecker(), "User specified skipping Restricted JRF tests");
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
domainParentDir + FS + "restrictedJRFD1 -model_file " +
getSampleModelFile("-constant") + " -archive_file " + getSampleArchiveFile() +
" -domain_type RestrictedJRF";
try (PrintWriter out = getTestMethodWriter(testInfo)) {
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
assertEquals(0, result.exitValue(), "Unexpected return code");

}
try (PrintWriter out = getTestMethodWriter(testInfo)) {
Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
String cmd = discoverDomainScript
cmd = discoverDomainScript
+ " -oracle_home " + mwhome_12213
+ " -domain_home " + domainParentDir + FS + "restrictedJRFD1"
+ " -archive_file " + discoveredArchive
Expand Down Expand Up @@ -540,9 +549,17 @@ private void verifyFDiscoverDomainWithRequiredArgument(String expectedModelFile)
@Test
void test18DiscoverDomainWithModelFile(TestInfo testInfo) throws Exception {
assumeTrue(new RestrictedJrfChecker(), "User specified skipping Restricted JRF tests");
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
domainParentDir + FS + "restrictedJRFD1 -model_file " +
getSampleModelFile("-constant") + " -archive_file " + getSampleArchiveFile() +
" -domain_type RestrictedJRF";
try (PrintWriter out = getTestMethodWriter(testInfo)) {
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
assertEquals(0, result.exitValue(), "Unexpected return code");
}
Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
Path discoveredModelFile = getTestOutputPath(testInfo).resolve("discoveredRestrictedJRFD1.yaml");
String cmd = discoverDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
cmd = discoverDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
domainParentDir + FS + "restrictedJRFD1 -archive_file " + discoveredArchive +
" -model_file " + discoveredModelFile;
try (PrintWriter out = getTestMethodWriter(testInfo)) {
Expand All @@ -565,11 +582,20 @@ void test18DiscoverDomainWithModelFile(TestInfo testInfo) throws Exception {
@Test
void test19DiscoverDomainWithVariableFile(TestInfo testInfo) throws Exception {
assumeTrue(new JrfChecker(), "User specified skipping JRF tests");
Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
domainParentDir + FS + "restrictedJRFD1 -model_file " +
getSampleModelFile("-constant") + " -archive_file " + getSampleArchiveFile() +
" -domain_type RestrictedJRF";
try (PrintWriter out = getTestMethodWriter(testInfo)) {
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
assertEquals(0, result.exitValue(), "Unexpected return code");
}

Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
Path discoveredModelFile = getTestOutputPath(testInfo).resolve("discoveredRestrictedJRFD1.yaml");
Path discoveredVariableFile = getTestOutputPath(testInfo).resolve("discoveredRestrictedJRFD1.properties");

String cmd = discoverDomainScript
cmd = discoverDomainScript
+ " -oracle_home " + mwhome_12213
+ " -domain_home " + domainParentDir + FS + "restrictedJRFD1"
+ " -archive_file " + discoveredArchive
Expand Down Expand Up @@ -603,8 +629,20 @@ private void verifyGDiscoverDomainWithVariableFile(String expectedModelFile) thr
@Test
void test20DiscoverDomainJRFDomainType(TestInfo testInfo) throws Exception {
assumeTrue(new JrfChecker(), "User specified skipping JRF tests");
assumeTrue(rcuDomainCreated, "test20DiscoverDomainJRFDomainType skipped because testDCreateJRFDomainRunRCU failed");
waitForDatabase();
try (PrintWriter out = getTestMethodWriter(testInfo)) {
Path source = Paths.get(getSampleModelFile("2"));
Path modelOut = getTestOutputPath(testInfo).resolve(SAMPLE_MODEL_FILE_PREFIX + "2.yaml");
// create wdt model file to use in create, after substitution of DB host/ip
replaceStringInFile(source, modelOut, "%DB_HOST%", getDBContainerIP());

String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
domainParentDir + FS + "jrfDomain1 -model_file " +
modelOut + " -archive_file " + getSampleArchiveFile() + " -domain_type JRF -run_rcu";

CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
assertEquals(0, result.exitValue(), "Unexpected return code");
}
try (PrintWriter out = getTestMethodWriter(testInfo)) {
Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
Path discoveredModelFile = getTestOutputPath(testInfo).resolve("discoveredJRFD1.yaml");
Expand Down Expand Up @@ -944,12 +982,21 @@ void test30OnlineUpdateApp(TestInfo testInfo) throws Exception {
@Tag("gate")
@Test
void test31DiscoverDomainWithModelFile(TestInfo testInfo) throws Exception {
assumeTrue(test30DomainCreated,
"test31DiscoverDomainWithModelFile skipped because test30OnlineUpdateApp domain creation failed");
String domainDir = "domain2";
String cmd = createDomainScript
+ " -oracle_home " + mwhome_12213
+ " -domain_home " + domainParentDir + FS + domainDir
+ " -model_file " + getSampleModelFile("-onlinebase")
+ " -archive_file " + getSampleArchiveFile();

try (PrintWriter out = getTestMethodWriter(testInfo)) {
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
assertEquals(0, result.exitValue(), "Unexpected return code");
}
Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
Path discoveredModelFile = getTestOutputPath(testInfo).resolve("discoveredModel.yaml");
Path discoveredVariableFile = getTestOutputPath(testInfo).resolve("discoveredVariable.properties");
String cmd = discoverDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
cmd = discoverDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
domainParentDir + FS + "domain2 -archive_file " + discoveredArchive +
" -model_file " + discoveredModelFile + " -variable_file " + discoveredVariableFile;
try (PrintWriter out = getTestMethodWriter(testInfo)) {
Expand Down