From 223589a38a7a5acd4204e8443d5f4dd8975efcb4 Mon Sep 17 00:00:00 2001 From: Aaron Jhaj Date: Thu, 15 Sep 2022 13:51:46 +0100 Subject: [PATCH 1/7] annotated compilation test with Github issue Signed-off-by: Aaron Jhaj --- .../simbank/local/online/CompilationLocalJava11Ubuntu.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/local/online/CompilationLocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/local/online/CompilationLocalJava11Ubuntu.java index c24c9e13..b306f783 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/local/online/CompilationLocalJava11Ubuntu.java +++ b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/local/online/CompilationLocalJava11Ubuntu.java @@ -15,6 +15,9 @@ import dev.galasa.linux.ILinuxImage; import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; +import dev.galasa.githubissue.GitHubIssue; + +@GitHubIssue(issue = "1174") @Test @TestAreas({"compilation","localecosystem","java11","ubuntu"}) From e50af365e6dee11432bd2b0db76bb80b7d74091a Mon Sep 17 00:00:00 2001 From: Aaron Jhaj Date: Wed, 18 Jan 2023 14:54:07 +0000 Subject: [PATCH 2/7] adding gradle.properties to fix compilation test deffect Signed-off-by: Aaron Jhaj --- .../simbank/AbstractCompilationLocalSimBank.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 77cb1ce9..1f0a9c36 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()); + + } } From 3bfc1a061a54cf845371ec50727fcc9ae255ab2b Mon Sep 17 00:00:00 2001 From: Jade Carino <65225359+jadecarino@users.noreply.github.com> Date: Thu, 9 Feb 2023 17:38:45 +0000 Subject: [PATCH 3/7] Updating GitHubIssue annotations (#171) * Upgrade versions of Galasa projects inttests uses, as out of date Signed-off-by: Jade Carino * Bump CICSTS dependency to 0.25.0 Signed-off-by: Jade Carino * Remove GitHubIssue annotation for RSE defect as is now fixed Signed-off-by: Jade Carino * Annotate Docker inttests with GitHubIssue as there is a defect causing them to fail Signed-off-by: Jade Carino --------- Signed-off-by: Jade Carino --- .../dev/galasa/inttests/docker/AbstractDockerUbuntuLocal.java | 2 ++ .../dev/galasa/inttests/zosBatch/AbstractZosBatchLocalRSE.java | 1 - .../dev/galasa/inttests/zosFile/AbstractZosFileLocalRSE.java | 1 - .../inttests/zosFileDataset/AbstractZosFileDatasetLocalRSE.java | 1 - .../dev/galasa/inttests/zosVSAM/AbstractZosVSAMLocalRSE.java | 1 - 5 files changed, 2 insertions(+), 4 deletions(-) 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 d3c2619f..dfd1e353 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 69564d23..9314be14 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 6b404c03..b032c713 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 eb3bd295..3d9c567d 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 15e6cfe2..4bb7f99a 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"); From ae37108410dfb6f607f6af5e2e4f2a734769b3ce Mon Sep 17 00:00:00 2001 From: Jade Carino <65225359+jadecarino@users.noreply.github.com> Date: Mon, 27 Feb 2023 11:13:16 +0000 Subject: [PATCH 4/7] Remove Docker integrated tests (#174) Signed-off-by: Jade Carino --- .../galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java | 2 +- .../galasa/inttests/docker/local/DockerLocalJava16Ubuntu.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java index 2041f26f..b9a4ad9b 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java +++ b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java @@ -17,7 +17,7 @@ import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; -@Test +// @Test @TestAreas({"dockermanager", "localecosystem", "java11", "ubuntu"}) @Tags({"codecoverage"}) public class DockerLocalJava11Ubuntu extends AbstractDockerUbuntuLocal { diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava16Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava16Ubuntu.java index 5c6d7c15..a76fecb0 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava16Ubuntu.java +++ b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava16Ubuntu.java @@ -16,7 +16,7 @@ import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; -@Test +// @Test @TestAreas({"dockermanager", "localecosystem", "java16", "ubuntu"}) public class DockerLocalJava16Ubuntu extends AbstractDockerUbuntuLocal { From eb6b0bc283890604d1f07aa8e1b57859788410f8 Mon Sep 17 00:00:00 2001 From: Mike Cobbett <77053+techcobweb@users.noreply.github.com> Date: Mon, 27 Feb 2023 13:33:58 +0000 Subject: [PATCH 5/7] uplift dependency on galasa framework to 0.26.0 instead of 0,.25.0 (#173) * uplift dependency on galasa framework to 0.26.0 instead of 0,.25.0 Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> * bump up versions to match the uber obr manually Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --------- Signed-off-by: Mike Cobbett <77053+techcobweb@users.noreply.github.com> --- galasa-inttests-parent/build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/galasa-inttests-parent/build.gradle b/galasa-inttests-parent/build.gradle index 3bc0b61b..7489c007 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' From 7a0c8486525aac933674b0d5f8030366e24bb4f6 Mon Sep 17 00:00:00 2001 From: Jade Carino <65225359+jadecarino@users.noreply.github.com> Date: Sun, 5 Mar 2023 16:06:24 +0000 Subject: [PATCH 6/7] Add Docker inttests back to schedule now DSS cleared there should be resource available (#175) Signed-off-by: Jade Carino --- .../galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java | 2 +- .../galasa/inttests/docker/local/DockerLocalJava16Ubuntu.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java index b9a4ad9b..2041f26f 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java +++ b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava11Ubuntu.java @@ -17,7 +17,7 @@ import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; -// @Test +@Test @TestAreas({"dockermanager", "localecosystem", "java11", "ubuntu"}) @Tags({"codecoverage"}) public class DockerLocalJava11Ubuntu extends AbstractDockerUbuntuLocal { diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava16Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava16Ubuntu.java index a76fecb0..5c6d7c15 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava16Ubuntu.java +++ b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/docker/local/DockerLocalJava16Ubuntu.java @@ -16,7 +16,7 @@ import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; -// @Test +@Test @TestAreas({"dockermanager", "localecosystem", "java16", "ubuntu"}) public class DockerLocalJava16Ubuntu extends AbstractDockerUbuntuLocal { From 9e145fa8e46a12645c823b4b834fdc0d343cf250 Mon Sep 17 00:00:00 2001 From: Jade Carino Date: Thu, 9 Mar 2023 12:37:03 +0000 Subject: [PATCH 7/7] Upgrade inttests version to 0.26.0 Signed-off-by: Jade Carino --- galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml | 4 ++-- galasa-inttests-parent/dev.galasa.inttests/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml b/galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml index 80fd5bec..ad07bdae 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 4b519d95..fc2aac28 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'