Skip to content

It tests prep wdt 2.0 release 3.3 #2740

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 2 commits into from
Jan 27, 2022
Merged

It tests prep wdt 2.0 release 3.3 #2740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa63916
adding quotes around deletes in WDT models for WDT 2.0
robertpatrick Jan 26, 2022
93bb734
fixing deleteds model
robertpatrick Jan 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ void testMiiDeleteDatasource() {
Path pathToDeleteDSYaml = Paths.get(WORK_DIR + "/deleteds.yaml");
String yamlToDeleteDS = "resources:\n"
+ " JDBCSystemResource:\n"
+ " !TestDataSource2:";
+ " '!TestDataSource2':";

assertDoesNotThrow(() -> Files.write(pathToDeleteDSYaml, yamlToDeleteDS.getBytes()));

Expand Down
12 changes: 6 additions & 6 deletions integration-tests/src/test/resources/wdt-models/model.delete.sysresources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.

resources:
FileStore:
!TestClusterFileStore:
'!TestClusterFileStore':
JMSServer:
!TestClusterJmsServer:
'!TestClusterJmsServer':
JMSSystemResource:
!TestClusterJmsModule:
'!TestClusterJmsModule':
JDBCSystemResource:
!TestDataSource:
'!TestDataSource':
appDeployments:
Application:
!myear:
'!myear':
4 changes: 2 additions & 2 deletions integration-tests/src/test/resources/wdt-models/multi-model-delete-one-ds.20.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
resources:
JDBCSystemResource:
Expand All @@ -20,4 +20,4 @@ resources:
Properties:
user:
Value: j2ee
!TestDataSource2:
'!TestDataSource2':