Skip to content

Commit c26d884

Browse files
authored
Remove top-level src directory (#2139)
* Remove top-level src directory * Review comment * Missing changes
1 parent 5cfb14c commit c26d884

File tree

90 files changed

+15
-15
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+15
-15
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN set -eux; \
5151

5252
USER oracle
5353

54-
COPY --chown=oracle:root src/scripts/* /operator/
54+
COPY --chown=oracle:root operator/scripts/* /operator/
5555
COPY --chown=oracle:root operator/target/weblogic-kubernetes-operator.jar /operator/weblogic-kubernetes-operator.jar
5656
COPY --chown=oracle:root operator/target/lib/*.jar /operator/lib/
5757

integration-tests/README.md

Lines changed: 1 addition & 1 deletion

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioDomainInImage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public void testIstioDomainHomeInImage() {
215215
assertTrue(checkConsole, "Failed to access WebLogic console");
216216
logger.info("WebLogic console is accessible");
217217

218-
Path archivePath = Paths.get(ITTESTS_DIR, "../src/integration-tests/apps/testwebapp.war");
218+
Path archivePath = Paths.get(ITTESTS_DIR, "../operator/integration-tests/apps/testwebapp.war");
219219
ExecResult result = null;
220220
result = deployToClusterUsingRest(K8S_NODEPORT_HOST,
221221
String.valueOf(istioIngressPort),

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioDomainInPV.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ public void testIstioDomainHomeInPv() {
313313
assertTrue(checkConsole, "Failed to access WebLogic console");
314314
logger.info("WebLogic console is accessible");
315315

316-
Path archivePath = Paths.get(ITTESTS_DIR, "../src/integration-tests/apps/testwebapp.war");
316+
Path archivePath = Paths.get(ITTESTS_DIR, "../operator/integration-tests/apps/testwebapp.war");
317317
ExecResult result = null;
318318
result = deployToClusterUsingRest(K8S_NODEPORT_HOST,
319319
String.valueOf(istioIngressPort),

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMiiDomain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ public void testIstioModelInImage() {
222222
logger.info("WebLogic console is accessible");
223223

224224

225-
Path archivePath = Paths.get(ITTESTS_DIR, "../src/integration-tests/apps/testwebapp.war");
225+
Path archivePath = Paths.get(ITTESTS_DIR, "../operator/integration-tests/apps/testwebapp.war");
226226
ExecResult result = null;
227227
result = deployToClusterUsingRest(K8S_NODEPORT_HOST,
228228
String.valueOf(istioIngressPort),

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioTwoDomainsInImage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public void testIstioTwoDomainsWithSingleIngress() {
278278
checkAppUsingHostHeader(consoleUrl, domainNamespace1 + ".org");
279279
assertTrue(checkConsole, "Failed to access WebLogic console on domain1");
280280
logger.info("WebLogic console on domain1 is accessible");
281-
Path archivePath = Paths.get(ITTESTS_DIR, "../src/integration-tests/apps/testwebapp.war");
281+
Path archivePath = Paths.get(ITTESTS_DIR, "../operator/integration-tests/apps/testwebapp.war");
282282
ExecResult result = null;
283283
result = deployToClusterUsingRest(K8S_NODEPORT_HOST,
284284
String.valueOf(istioIngressPort),

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiSample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class ItMiiSample {
5757
private static final String MII_SAMPLES_WORK_DIR = RESULTS_ROOT
5858
+ "/model-in-image-sample-work-dir";
5959
private static final String MII_SAMPLES_SCRIPT =
60-
"../src/integration-tests/model-in-image/run-test.sh";
60+
"../operator/integration-tests/model-in-image/run-test.sh";
6161

6262
private static final String CURRENT_DATE_TIME = getDateAndTimeStamp();
6363
private static final String MII_SAMPLE_WLS_IMAGE_NAME_V1 = DOMAIN_IMAGES_REPO + "mii-" + CURRENT_DATE_TIME + "-wlsv1";

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1317,7 +1317,7 @@ private static String createAndVerifyDomainInImage() {
13171317
// create image with model files
13181318
logger.info("Create image with model file with monitoring exporter app and verify");
13191319
String app1Path = String.format("%s/wls-exporter.war", monitoringExporterAppDir);
1320-
String app2Path = String.format("%s/../src/integration-tests/apps/testwebapp.war", ITTESTS_DIR);
1320+
String app2Path = String.format("%s/../operator/integration-tests/apps/testwebapp.war", ITTESTS_DIR);
13211321

13221322
List<String> appList = new ArrayList();
13231323
appList.add(app1Path);

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/CommonTestUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3476,7 +3476,7 @@ public static void deployAndAccessApplication(String domainNamespace,
34763476
String msInternalPort) {
34773477
final LoggingFacade logger = getLogger();
34783478

3479-
Path archivePath = Paths.get(ITTESTS_DIR, "../src/integration-tests/apps/testwebapp.war");
3479+
Path archivePath = Paths.get(ITTESTS_DIR, "../operator/integration-tests/apps/testwebapp.war");
34803480
logger.info("Deploying application {0} to domain {1} cluster target cluster-1 in namespace {2}",
34813481
archivePath, domainUid, domainNamespace);
34823482
logger.info("Deploying webapp {0} to admin server and cluster", archivePath);

0 commit comments

Comments
 (0)