diff --git a/galasa-inttests-parent/build.gradle b/galasa-inttests-parent/build.gradle index 3bc0b61..7489c00 100644 --- a/galasa-inttests-parent/build.gradle +++ b/galasa-inttests-parent/build.gradle @@ -87,15 +87,15 @@ subprojects { dependencies { compileOnly 'dev.galasa:dev.galasa:0.21.0' - compileOnly 'dev.galasa:dev.galasa.framework:0.25.0' + compileOnly 'dev.galasa:dev.galasa.framework:0.26.0' compileOnly 'dev.galasa:dev.galasa.core.manager:0.25.0' - compileOnly 'dev.galasa:dev.galasa.zos.manager:0.25.0' - compileOnly 'dev.galasa:dev.galasa.ipnetwork.manager:0.21.0' + compileOnly 'dev.galasa:dev.galasa.zos.manager:0.26.0' + compileOnly 'dev.galasa:dev.galasa.ipnetwork.manager:0.25.0' compileOnly 'dev.galasa:dev.galasa.http.manager:0.25.0' compileOnly 'dev.galasa:dev.galasa.artifact.manager:0.25.0' compileOnly 'dev.galasa:dev.galasa.linux.manager:0.21.0' compileOnly 'dev.galasa:dev.galasa.windows.manager:0.21.0' - compileOnly 'dev.galasa:dev.galasa.openstack.manager:0.25.0' + compileOnly 'dev.galasa:dev.galasa.openstack.manager:0.26.0' compileOnly 'dev.galasa:dev.galasa.kubernetes.manager:0.25.0' compileOnly 'dev.galasa:dev.galasa.docker.manager:0.25.0' compileOnly 'dev.galasa:dev.galasa.galasaecosystem.manager:0.25.0' @@ -104,7 +104,7 @@ subprojects { compileOnly 'dev.galasa:dev.galasa.java.windows.manager:0.21.0' compileOnly 'dev.galasa:dev.galasa.sem.manager:0.25.0' compileOnly 'dev.galasa:dev.galasa.cicsts.manager:0.25.0' - compileOnly 'dev.galasa:dev.galasa.zosprogram.manager:0.21.0' + compileOnly 'dev.galasa:dev.galasa.zosprogram.manager:0.25.0' compileOnly 'dev.galasa:dev.galasa.githubissue.manager:0.25.0' compileOnly 'commons-logging:commons-logging:1.2' compileOnly 'org.assertj:assertj-core:3.11.0' diff --git a/galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml b/galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml index 80fd5be..ad07bda 100644 --- a/galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml +++ b/galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml @@ -5,7 +5,7 @@ dev.galasa dev.galasa.inttests.obr - 0.25.0 + 0.26.0 galasa-obr @@ -25,7 +25,7 @@ dev.galasa dev.galasa.inttests - 0.25.0 + 0.26.0 compile diff --git a/galasa-inttests-parent/dev.galasa.inttests/build.gradle b/galasa-inttests-parent/dev.galasa.inttests/build.gradle index 4b519d9..fc2aac2 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/build.gradle +++ b/galasa-inttests-parent/dev.galasa.inttests/build.gradle @@ -5,7 +5,7 @@ plugins { description = 'Galasa Integration Tests' -version = '0.25.0' +version = '0.26.0' dependencies { implementation 'com.google.code.gson:gson:2.8.5' diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/AbstractCompilationLocalSimBank.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/AbstractCompilationLocalSimBank.java index 77cb1ce..1f0a9c3 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/AbstractCompilationLocalSimBank.java +++ b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/AbstractCompilationLocalSimBank.java @@ -57,6 +57,10 @@ private Path setupSimPlatform() throws ResourceUnavailableException, IOException refactorSimplatform(simplatformParent); outputFiles("simplatform-refactored", simplatformParent, false); + + + makeGradleProperties(); + return simplatformParent; } @@ -199,5 +203,13 @@ private void changePrefix(Path file) throws IOException { Files.write(file, fileData.getBytes()); logger.trace("Changing prefix (" + incumbent + ") to \"" + prefix + "\" in file: " + file.toString()); } + + private void makeGradleProperties() throws IOException{ + String gradleProperties = "gradle.properties"; + String obr = "sourceMaven=https://development.galasa.dev/main/maven-repo/obr/"; + Path gradlePropertiesFile = testRunDirectory.resolve("/.gradle/" + gradleProperties); + Files.write(gradlePropertiesFile, obr.getBytes()); + + } } diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/AbstractDockerUbuntuLocal.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/AbstractDockerUbuntuLocal.java index d3c2619..dfd1e35 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/AbstractDockerUbuntuLocal.java +++ b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/AbstractDockerUbuntuLocal.java @@ -17,7 +17,9 @@ import dev.galasa.ResultArchiveStoreContentType; import dev.galasa.SetContentType; import dev.galasa.core.manager.StoredArtifactRoot; +import dev.galasa.githubissue.GitHubIssue; +@GitHubIssue( issue = "1366" ) public abstract class AbstractDockerUbuntuLocal extends AbstractDocker { @StoredArtifactRoot diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/AbstractZosBatchLocalRSE.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/AbstractZosBatchLocalRSE.java index 69564d2..9314be1 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/AbstractZosBatchLocalRSE.java +++ b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/AbstractZosBatchLocalRSE.java @@ -14,7 +14,6 @@ public abstract class AbstractZosBatchLocalRSE { @Test - @GitHubIssue( issue = "1060" ) public void testZosBatchIvtTestRSE() throws Exception { //Use RSE batch diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/AbstractZosFileLocalRSE.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/AbstractZosFileLocalRSE.java index 6b404c0..b032c71 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/AbstractZosFileLocalRSE.java +++ b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/AbstractZosFileLocalRSE.java @@ -15,7 +15,6 @@ public abstract class AbstractZosFileLocalRSE { @Test - @GitHubIssue( issue = "1060" ) public void testZosFileIvtTestRSE() throws Exception { getEcosystem().setCpsProperty("zos.bundle.extra.file.manager", "dev.galasa.zosfile.rseapi.manager"); diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/AbstractZosFileDatasetLocalRSE.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/AbstractZosFileDatasetLocalRSE.java index eb3bd29..3d9c567 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/AbstractZosFileDatasetLocalRSE.java +++ b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/AbstractZosFileDatasetLocalRSE.java @@ -14,7 +14,6 @@ public abstract class AbstractZosFileDatasetLocalRSE { @Test - @GitHubIssue( issue = "1060" ) public void testZosFileIvtTestRSE() throws Exception { getEcosystem().setCpsProperty("zos.bundle.extra.file.manager", "dev.galasa.zosfile.rseapi.manager"); diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/AbstractZosVSAMLocalRSE.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/AbstractZosVSAMLocalRSE.java index 15e6cfe..4bb7f99 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/AbstractZosVSAMLocalRSE.java +++ b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/AbstractZosVSAMLocalRSE.java @@ -14,7 +14,6 @@ public abstract class AbstractZosVSAMLocalRSE { @Test - @GitHubIssue( issue = "1060" ) public void testZosFileIvtTestRSE() throws Exception { getEcosystem().setCpsProperty("zos.bundle.extra.file.manager", "dev.galasa.zosfile.rseapi.manager");