From c6c42ec647d53e904dbdde312393a485f5971a40 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Thu, 26 Sep 2024 10:03:05 +0100 Subject: [PATCH 1/5] Remove tests that use the SEM manager, bump to 0.38.0 Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- galasa-inttests-parent/build.gradle | 11 +- .../dev.galasa.inttests.obr/pom.xml | 4 +- .../dev.galasa.inttests/build.gradle | 4 +- .../inttests/ceci/AbstractCECILocal.java | 114 ------------------ .../ceci/local/CECILocalJava11Ubuntu.java | 48 -------- .../CECILocalJava11UbuntuIsolated.java | 47 -------- .../local/mvp/CECILocalJava11UbuntuMvp.java | 47 -------- .../inttests/ceda/AbstractCEDALocal.java | 61 ---------- .../ceda/local/CEDALocalJava11Ubuntu.java | 48 -------- .../CEDALocalJava11UbuntuIsolated.java | 47 -------- .../inttests/cemt/AbstractCEMTLocal.java | 61 ---------- .../cemt/local/CEMTLocalJava11Ubuntu.java | 48 -------- .../CEMTLocalJava11UbuntuIsolated.java | 47 -------- .../inttests/cicsts/AbstractCICSTSLocal.java | 61 ---------- .../cicsts/local/CICSTSLocalJava11Ubuntu.java | 48 -------- .../CICSTSLocalJava11UbuntuIsolated.java | 47 -------- .../galasa/inttests/sdv/AbstractSDVLocal.java | 69 ----------- .../sdv/local/SDVLocalJava11Ubuntu.java | 48 -------- .../SDVLocalJava11UbuntuIsolated.java | 47 -------- 19 files changed, 7 insertions(+), 900 deletions(-) delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/AbstractCECILocal.java delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/CECILocalJava11Ubuntu.java delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/AbstractCEDALocal.java delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/local/CEDALocalJava11Ubuntu.java delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/AbstractCEMTLocal.java delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/local/CEMTLocalJava11Ubuntu.java delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/AbstractCICSTSLocal.java delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/AbstractSDVLocal.java delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/local/SDVLocalJava11Ubuntu.java delete mode 100644 galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java diff --git a/galasa-inttests-parent/build.gradle b/galasa-inttests-parent/build.gradle index 4e72871..43ddb92 100644 --- a/galasa-inttests-parent/build.gradle +++ b/galasa-inttests-parent/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'dev.galasa.githash' version '0.33.0' apply false - id 'dev.galasa.testcatalog' version '0.33.0' apply false - id 'dev.galasa.tests' version '0.33.0' apply false + id 'dev.galasa.githash' version '0.36.0' apply false + id 'dev.galasa.testcatalog' version '0.36.0' apply false + id 'dev.galasa.tests' version '0.36.0' apply false } subprojects { @@ -86,7 +86,7 @@ subprojects { // } dependencies { - implementation platform('dev.galasa:galasa-bom:0.36.0') + implementation platform('dev.galasa:galasa-bom:0.38.0') compileOnly 'dev.galasa:dev.galasa' compileOnly 'dev.galasa:dev.galasa.framework' @@ -104,9 +104,6 @@ subprojects { compileOnly 'dev.galasa:dev.galasa.java.manager' compileOnly 'dev.galasa:dev.galasa.java.ubuntu.manager' compileOnly 'dev.galasa:dev.galasa.java.windows.manager' - compileOnly 'dev.galasa:dev.galasa.sem.manager' - compileOnly 'dev.galasa:dev.galasa.cicsts.manager' - compileOnly 'dev.galasa:dev.galasa.sdv.manager' compileOnly 'dev.galasa:dev.galasa.zosprogram.manager' compileOnly 'dev.galasa:dev.galasa.githubissue.manager' compileOnly 'commons-logging:commons-logging:1.2' diff --git a/galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml b/galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml index bbd99f0..34c2daa 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.36.0 + 0.38.0 galasa-obr @@ -25,7 +25,7 @@ dev.galasa dev.galasa.inttests - 0.36.0 + 0.38.0 compile diff --git a/galasa-inttests-parent/dev.galasa.inttests/build.gradle b/galasa-inttests-parent/dev.galasa.inttests/build.gradle index 5b3ce89..2669dad 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/build.gradle +++ b/galasa-inttests-parent/dev.galasa.inttests/build.gradle @@ -5,11 +5,9 @@ plugins { description = 'Galasa Integration Tests' -version = '0.36.0' +version = '0.38.0' dependencies { - implementation platform('dev.galasa:galasa-bom:0.36.0') - implementation 'com.google.code.gson:gson:2.8.5' implementation 'commons-io:commons-io:2.9.0' } diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/AbstractCECILocal.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/AbstractCECILocal.java deleted file mode 100644 index a6b3d64..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/AbstractCECILocal.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.ceci; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.BeforeClass; -import dev.galasa.Test; -import dev.galasa.cicsts.CeciException; -import dev.galasa.cicsts.CemtException; -import dev.galasa.cicsts.CicsRegion; -import dev.galasa.cicsts.CicsTerminal; -import dev.galasa.cicsts.CicstsManagerException; -import dev.galasa.cicsts.ICicsRegion; -import dev.galasa.cicsts.ICicsTerminal; -import dev.galasa.core.manager.TestProperty; -import dev.galasa.galasaecosystem.GalasaEcosystemManagerException; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.zosprogram.IZosProgram; -import dev.galasa.zosprogram.ZosProgram; -import dev.galasa.zosprogram.ZosProgram.Language; - -public abstract class AbstractCECILocal { - - @CicsRegion(cicsTag = "A") - public ICicsRegion cics; - - @CicsTerminal(cicsTag = "A") - public ICicsTerminal terminal; - - @ZosProgram(name = "APITEST", location = "/zosPrograms", language = Language.COBOL, imageTag = "PRIMARY", cics = true) - public IZosProgram APITEST; - - @ZosProgram(name = "CONTTEST", location = "/zosPrograms", language = Language.COBOL, imageTag = "PRIMARY", cics = true) - public IZosProgram CONTTEST; - - @ZosProgram(name = "PRGABEND", location = "/zosPrograms", language = Language.COBOL, imageTag = "PRIMARY", cics = true) - public IZosProgram PRGABEND; - - public String libName = "LIB1"; - - public String groupName = "PROGGRP"; - - @TestProperty(prefix = "zos3270", suffix = "terminal.output", required = false) - public String terminalOutput; - - @BeforeClass - public void loadResources() throws CeciException, CicstsManagerException { - // Define compiled COBOL programs to CICS Region - cics.ceda().createResource(terminal, "PROGRAM", APITEST.getName(), groupName, null); - cics.ceda().createResource(terminal, "PROGRAM", CONTTEST.getName(), groupName, null); - cics.ceda().createResource(terminal, "PROGRAM", PRGABEND.getName(), groupName, null); - // Define Library where all Programs are compiled - cics.ceda().createResource(terminal, "LIBRARY", libName, groupName, "DSNAME01(" + APITEST.getLoadlib().getName() + ")"); - // Install everything - cics.ceda().installGroup(terminal, groupName); - } - - @BeforeClass - public void checkResourcesLoaded() throws CemtException, CicstsManagerException { - assertThat(cics.cemt().inquireResource(terminal, "PROGRAM", APITEST.getName()).get("program")).isEqualTo(APITEST.getName()); - assertThat(cics.cemt().inquireResource(terminal, "PROGRAM", CONTTEST.getName()).get("program")).isEqualTo(CONTTEST.getName()); - assertThat(cics.cemt().inquireResource(terminal, "PROGRAM", PRGABEND.getName()).get("program")).isEqualTo(PRGABEND.getName()); - assertThat(cics.cemt().inquireResource(terminal, "LIBRARY", libName).get("library")).isEqualTo(libName); - } - - @BeforeClass - public void setProperties() throws GalasaEcosystemManagerException, CicstsManagerException { - // Setting these properties in the shadow ecosystem - getEcosystem().setCpsProperty("cicsts.provision.type", "DSE"); - getEcosystem().setCpsProperty("cicsts.dse.tag.A.applid", cics.getApplid()); - getEcosystem().setCpsProperty("cicsts.dse.tag.A.version", cics.getVersion().toString()); -// getEcosystem().setCpsProperty("cicsts.dse.tag.A.jvmprofiledir", cics.getJvmProfileDir()); -// getEcosystem().setCpsProperty("cicsts.dse.tag.A.usshome", cics.getUssHome()); -// getEcosystem().setCpsProperty("cicsts.dse.tag.A.javahome", cics.getJavaHome()); - getEcosystem().setCpsProperty("cicsts.default.logon.initial.text", "HIT ENTER FOR LATEST STATUS"); - getEcosystem().setCpsProperty("cicsts.default.logon.gm.text", "******\\(R)"); - - // Setting Terminal output in the child ecosystem if overridden in the parent. Default is Json. - if (terminalOutput != null && !terminalOutput.equals("")) { - getEcosystem().setCpsProperty("zos3270.terminal.output", terminalOutput); - } - - } - - @Test - public void testCECIIvtTest() throws Exception { - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.cicsts.ceci.manager.ivt", - "dev.galasa.cicsts.ceci.manager.ivt.CECIManagerIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).as("The test indicates the test passes").isEqualTo("Passed"); - - } - - abstract protected IGenericEcosystem getEcosystem(); - -} \ No newline at end of file diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/CECILocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/CECILocalJava11Ubuntu.java deleted file mode 100644 index 3207fa0..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/CECILocalJava11Ubuntu.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.ceci.local; - -import dev.galasa.Tags; -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.ceci.AbstractCECILocal; -import dev.galasa.java.JavaVersion; -import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; -import dev.galasa.java.ubuntu.JavaUbuntuInstallation; -import dev.galasa.linux.ILinuxImage; -import dev.galasa.linux.LinuxImage; -import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; -import dev.galasa.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -@SemTopology -@Test -@TestAreas({"ceciManager","localecosystem","java11","ubuntu"}) -@Tags({"codecoverage"}) -public class CECILocalJava11Ubuntu extends AbstractCECILocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", addDefaultZosImage = "PRIMARY") - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu) - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @ZosImage - public IZosImage zosImage; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java deleted file mode 100644 index 5d2d44c..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.ceci.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.inttests.ceci.AbstractCECILocal; -import dev.galasa.java.JavaVersion; -import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; -import dev.galasa.java.ubuntu.JavaUbuntuInstallation; -import dev.galasa.linux.ILinuxImage; -import dev.galasa.linux.LinuxImage; -import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; -import dev.galasa.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -@SemTopology -@Test -@TestAreas({"ceciManager","localecosystem","java11","ubuntu","isolated"}) -public class CECILocalJava11UbuntuIsolated extends AbstractCECILocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", addDefaultZosImage = "PRIMARY", isolationInstallation = IsolationInstallation.Full) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu, capabilities = "isolated") - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @ZosImage - public IZosImage zosImage; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java deleted file mode 100644 index 58f5660..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.ceci.local.mvp; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.inttests.ceci.AbstractCECILocal; -import dev.galasa.java.JavaVersion; -import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; -import dev.galasa.java.ubuntu.JavaUbuntuInstallation; -import dev.galasa.linux.ILinuxImage; -import dev.galasa.linux.LinuxImage; -import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; -import dev.galasa.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -@SemTopology -// @Test -@TestAreas({"ceciManager","localecosystem","java11","ubuntu","mvp"}) -public class CECILocalJava11UbuntuMvp extends AbstractCECILocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", addDefaultZosImage = "PRIMARY", isolationInstallation = IsolationInstallation.Mvp) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu, capabilities = "isolated") - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @ZosImage - public IZosImage zosImage; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/AbstractCEDALocal.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/AbstractCEDALocal.java deleted file mode 100644 index c3c36b6..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/AbstractCEDALocal.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.ceda; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.BeforeClass; -import dev.galasa.Test; -import dev.galasa.cicsts.CicsRegion; -import dev.galasa.cicsts.CicstsManagerException; -import dev.galasa.cicsts.ICicsRegion; -import dev.galasa.galasaecosystem.GalasaEcosystemManagerException; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractCEDALocal { - - @CicsRegion(cicsTag = "A") - public ICicsRegion cics; - - @BeforeClass - public void setProperties() throws GalasaEcosystemManagerException, CicstsManagerException { - // Setting these properties in the shadow ecosystem - getEcosystem().setCpsProperty("cicsts.provision.type", "DSE"); - getEcosystem().setCpsProperty("cicsts.dse.tag.A.applid", cics.getApplid()); - getEcosystem().setCpsProperty("cicsts.dse.tag.A.version", cics.getVersion().toString()); -// getEcosystem().setCpsProperty("cicsts.dse.tag.A.jvmprofiledir", cics.getJvmProfileDir()); -// getEcosystem().setCpsProperty("cicsts.dse.tag.A.usshome", cics.getUssHome()); -// getEcosystem().setCpsProperty("cicsts.dse.tag.A.javahome", cics.getJavaHome()); - getEcosystem().setCpsProperty("cicsts.default.logon.initial.text", "HIT ENTER FOR LATEST STATUS"); - getEcosystem().setCpsProperty("cicsts.default.logon.gm.text", "******\\(R)"); - } - - @Test - public void testCEDAIvtTest() throws Exception { - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.cicsts.ceda.manager.ivt", - "dev.galasa.cicsts.ceda.manager.ivt.CedaManagerIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).as("The test indicates the test passes").isEqualTo("Passed"); - - } - - abstract protected IGenericEcosystem getEcosystem(); - -} \ No newline at end of file diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/local/CEDALocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/local/CEDALocalJava11Ubuntu.java deleted file mode 100644 index 2df0258..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/local/CEDALocalJava11Ubuntu.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.ceda.local; - -import dev.galasa.Tags; -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.ceda.AbstractCEDALocal; -import dev.galasa.java.JavaVersion; -import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; -import dev.galasa.java.ubuntu.JavaUbuntuInstallation; -import dev.galasa.linux.ILinuxImage; -import dev.galasa.linux.LinuxImage; -import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; -import dev.galasa.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -@SemTopology -@Test -@TestAreas({"cedaManager","localecosystem","java11","ubuntu"}) -@Tags({"codecoverage"}) -public class CEDALocalJava11Ubuntu extends AbstractCEDALocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", addDefaultZosImage = "PRIMARY") - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu) - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @ZosImage - public IZosImage zosImage; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java deleted file mode 100644 index 3afdfa2..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.ceda.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.inttests.ceda.AbstractCEDALocal; -import dev.galasa.java.JavaVersion; -import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; -import dev.galasa.java.ubuntu.JavaUbuntuInstallation; -import dev.galasa.linux.ILinuxImage; -import dev.galasa.linux.LinuxImage; -import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; -import dev.galasa.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -@SemTopology -@Test -@TestAreas({"cedaManager","localecosystem","java11","ubuntu","isolated"}) -public class CEDALocalJava11UbuntuIsolated extends AbstractCEDALocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", addDefaultZosImage = "PRIMARY", isolationInstallation = IsolationInstallation.Full) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu, capabilities = "isolated") - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @ZosImage - public IZosImage zosImage; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/AbstractCEMTLocal.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/AbstractCEMTLocal.java deleted file mode 100644 index 84ce17a..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/AbstractCEMTLocal.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.cemt; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.BeforeClass; -import dev.galasa.Test; -import dev.galasa.cicsts.CicsRegion; -import dev.galasa.cicsts.CicstsManagerException; -import dev.galasa.cicsts.ICicsRegion; -import dev.galasa.galasaecosystem.GalasaEcosystemManagerException; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractCEMTLocal { - - @CicsRegion(cicsTag = "A") - public ICicsRegion cics; - - @BeforeClass - public void setProperties() throws GalasaEcosystemManagerException, CicstsManagerException { - // Setting these properties in the shadow ecosystem - getEcosystem().setCpsProperty("cicsts.provision.type", "DSE"); - getEcosystem().setCpsProperty("cicsts.dse.tag.A.applid", cics.getApplid()); - getEcosystem().setCpsProperty("cicsts.dse.tag.A.version", cics.getVersion().toString()); -// getEcosystem().setCpsProperty("cicsts.dse.tag.A.jvmprofiledir", cics.getJvmProfileDir()); -// getEcosystem().setCpsProperty("cicsts.dse.tag.A.usshome", cics.getUssHome()); -// getEcosystem().setCpsProperty("cicsts.dse.tag.A.javahome", cics.getJavaHome()); - getEcosystem().setCpsProperty("cicsts.default.logon.initial.text", "HIT ENTER FOR LATEST STATUS"); - getEcosystem().setCpsProperty("cicsts.default.logon.gm.text", "******\\(R)"); - } - - @Test - public void testCEMTIvtTest() throws Exception { - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.cicsts.cemt.manager.ivt", - "dev.galasa.cicsts.cemt.manager.ivt.CEMTManagerIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).as("The test indicates the test passes").isEqualTo("Passed"); - - } - - abstract protected IGenericEcosystem getEcosystem(); - -} \ No newline at end of file diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/local/CEMTLocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/local/CEMTLocalJava11Ubuntu.java deleted file mode 100644 index a7e83c0..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/local/CEMTLocalJava11Ubuntu.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.cemt.local; - -import dev.galasa.Tags; -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.cemt.AbstractCEMTLocal; -import dev.galasa.java.JavaVersion; -import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; -import dev.galasa.java.ubuntu.JavaUbuntuInstallation; -import dev.galasa.linux.ILinuxImage; -import dev.galasa.linux.LinuxImage; -import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; -import dev.galasa.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -@SemTopology -@Test -@TestAreas({"cemtManager","localecosystem","java11","ubuntu"}) -@Tags({"codecoverage"}) -public class CEMTLocalJava11Ubuntu extends AbstractCEMTLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", addDefaultZosImage = "PRIMARY") - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu) - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @ZosImage - public IZosImage zosImage; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java deleted file mode 100644 index 26ad556..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.cemt.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.inttests.cemt.AbstractCEMTLocal; -import dev.galasa.java.JavaVersion; -import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; -import dev.galasa.java.ubuntu.JavaUbuntuInstallation; -import dev.galasa.linux.ILinuxImage; -import dev.galasa.linux.LinuxImage; -import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; -import dev.galasa.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -@SemTopology -@Test -@TestAreas({"cemtManager","localecosystem","java11","ubuntu","isolated"}) -public class CEMTLocalJava11UbuntuIsolated extends AbstractCEMTLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", addDefaultZosImage = "PRIMARY", isolationInstallation = IsolationInstallation.Full) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu, capabilities = "isolated") - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @ZosImage - public IZosImage zosImage; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/AbstractCICSTSLocal.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/AbstractCICSTSLocal.java deleted file mode 100644 index e3e0efa..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/AbstractCICSTSLocal.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.cicsts; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.BeforeClass; -import dev.galasa.Test; -import dev.galasa.cicsts.CicsRegion; -import dev.galasa.cicsts.CicstsManagerException; -import dev.galasa.cicsts.ICicsRegion; -import dev.galasa.galasaecosystem.GalasaEcosystemManagerException; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractCICSTSLocal { - - @CicsRegion(cicsTag = "A") - public ICicsRegion cics; - - @BeforeClass - public void setProperties() throws GalasaEcosystemManagerException, CicstsManagerException { - // Setting these properties in the shadow ecosystem - getEcosystem().setCpsProperty("cicsts.provision.type", "DSE"); - getEcosystem().setCpsProperty("cicsts.dse.tag.A.applid", cics.getApplid()); - getEcosystem().setCpsProperty("cicsts.dse.tag.A.version", cics.getVersion().toString()); -// getEcosystem().setCpsProperty("cicsts.dse.tag.A.jvmprofiledir", cics.getJvmProfileDir()); -// getEcosystem().setCpsProperty("cicsts.dse.tag.A.usshome", cics.getUssHome()); -// getEcosystem().setCpsProperty("cicsts.dse.tag.A.javahome", cics.getJavaHome()); - getEcosystem().setCpsProperty("cicsts.default.logon.initial.text", "HIT ENTER FOR LATEST STATUS"); - getEcosystem().setCpsProperty("cicsts.default.logon.gm.text", "******\\(R)"); - } - - @Test - public void testCICSTSIvtTest() throws Exception { - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.cicsts.manager.ivt", - "dev.galasa.cicsts.manager.ivt.CICSTSManagerIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).as("The test indicates the test passes").isEqualTo("Passed"); - - } - - abstract protected IGenericEcosystem getEcosystem(); - -} \ No newline at end of file diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java deleted file mode 100644 index bf28c22..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.cicsts.local; - -import dev.galasa.Tags; -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.cicsts.AbstractCICSTSLocal; -import dev.galasa.java.JavaVersion; -import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; -import dev.galasa.java.ubuntu.JavaUbuntuInstallation; -import dev.galasa.linux.ILinuxImage; -import dev.galasa.linux.LinuxImage; -import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; -import dev.galasa.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -@SemTopology -@Test -@TestAreas({"cicstsManager","localecosystem","java11","ubuntu"}) -@Tags({"codecoverage"}) -public class CICSTSLocalJava11Ubuntu extends AbstractCICSTSLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", addDefaultZosImage = "PRIMARY") - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu) - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @ZosImage - public IZosImage zosImage; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java deleted file mode 100644 index 7dc1697..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.cicsts.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.inttests.cicsts.AbstractCICSTSLocal; -import dev.galasa.java.JavaVersion; -import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; -import dev.galasa.java.ubuntu.JavaUbuntuInstallation; -import dev.galasa.linux.ILinuxImage; -import dev.galasa.linux.LinuxImage; -import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; -import dev.galasa.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -@SemTopology -@Test -@TestAreas({"cicstsManager","localecosystem","java11","ubuntu","isolated"}) -public class CICSTSLocalJava11UbuntuIsolated extends AbstractCICSTSLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", addDefaultZosImage = "PRIMARY", isolationInstallation = IsolationInstallation.Full) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu, capabilities = "isolated") - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @ZosImage - public IZosImage zosImage; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/AbstractSDVLocal.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/AbstractSDVLocal.java deleted file mode 100644 index 7a13124..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/AbstractSDVLocal.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.sdv; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import java.util.Properties; - -import dev.galasa.BeforeClass; -import dev.galasa.ProductVersion; -import dev.galasa.Test; -import dev.galasa.cicsts.CicsRegion; -import dev.galasa.cicsts.CicstsManagerException; -import dev.galasa.cicsts.ICicsRegion; -import dev.galasa.galasaecosystem.GalasaEcosystemManagerException; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractSDVLocal { - - @CicsRegion(cicsTag = "SDVIVT") - public ICicsRegion cics; - - public Properties overrideProps; - - @BeforeClass - public void setProperties() throws GalasaEcosystemManagerException, CicstsManagerException { - // Setting these properties in the shadow ecosystem - overrideProps.put("cicsts.provision.type", "DSE"); - overrideProps.put("cicsts.default.logon.initial.text", "HIT ENTER FOR LATEST STATUS"); - overrideProps.put("cicsts.default.logon.gm.text", "******\\\\(R)"); - - } - - @Test - public void testSDVIvtTest() throws Exception { - - // Only run test if running on CICS 6.2+ - if (!cics.getVersion().isEarlierThan(ProductVersion.v(750))) { - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.sdv.manager.ivt", - "dev.galasa.sdv.manager.ivt.SdvManagerIVT", - null, - null, - null, - overrideProps); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).as("The test indicates the test passes").isEqualTo("Passed"); - } else { - // Just pass the test if running on earlier CICS versions - assertThat(true).isTrue(); - } - - } - - abstract protected IGenericEcosystem getEcosystem(); - -} \ No newline at end of file diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/local/SDVLocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/local/SDVLocalJava11Ubuntu.java deleted file mode 100644 index 85c916f..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/local/SDVLocalJava11Ubuntu.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.sdv.local; - -import dev.galasa.Tags; -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.sdv.AbstractSDVLocal; -import dev.galasa.java.JavaVersion; -import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; -import dev.galasa.java.ubuntu.JavaUbuntuInstallation; -import dev.galasa.linux.ILinuxImage; -import dev.galasa.linux.LinuxImage; -import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; -import dev.galasa.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -@SemTopology -@Test -@TestAreas({"sdvManager","localecosystem","java11","ubuntu"}) -@Tags({"codecoverage"}) -public class SDVLocalJava11Ubuntu extends AbstractSDVLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", addDefaultZosImage = "PRIMARY") - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu) - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @ZosImage - public IZosImage zosImage; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java deleted file mode 100644 index 57554c5..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.sdv.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.inttests.sdv.AbstractSDVLocal; -import dev.galasa.java.JavaVersion; -import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; -import dev.galasa.java.ubuntu.JavaUbuntuInstallation; -import dev.galasa.linux.ILinuxImage; -import dev.galasa.linux.LinuxImage; -import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; -import dev.galasa.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -@SemTopology -@Test -@TestAreas({"sdvManager","localecosystem","java11","ubuntu","isolated"}) -public class SDVLocalJava11UbuntuIsolated extends AbstractSDVLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", addDefaultZosImage = "PRIMARY", isolationInstallation = IsolationInstallation.Full) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu, capabilities = "isolated") - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @ZosImage - public IZosImage zosImage; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} From b54428bd5c3c60631c6702eec7e43fa40ba85fdb Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Thu, 26 Sep 2024 10:05:13 +0100 Subject: [PATCH 2/5] Stop attempting to deploy artifacts in build-locally Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- build-locally.sh | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/build-locally.sh b/build-locally.sh index 08212be..598e926 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -101,8 +101,6 @@ else info "Over-ridden by caller using the LOGS_DIR variable." fi -info "Using source code at ${source_dir}" -cd ${BASEDIR}/${source_dir} if [[ "${DEBUG}" == "1" ]]; then OPTIONAL_DEBUG_FLAG="-debug" else @@ -118,8 +116,9 @@ info "Log will be placed at ${log_file}" function gradle_build { h2 "Building using Gradle..." - - context=inttests/galasa-inttests-parent + + info "Using source code at ${source_dir}" + cd ${BASEDIR}/${source_dir} cmd="gradle --build-cache --parallel \ ${CONSOLE_FLAG} \ @@ -127,7 +126,7 @@ function gradle_build { -Dorg.gradle.java.home=${JAVA_HOME} \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/obr ${OPTIONAL_DEBUG_FLAG} \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - publish publishToMavenLocal \ + build publishToMavenLocal \ " info "Using this command: $cmd" @@ -136,8 +135,8 @@ function gradle_build { success "Built OK" } -function publish_artifacts { - h2 "Publishing using Maven..." +function build_obr { + h2 "Building OBR using Maven..." cd ${BASEDIR}/galasa-inttests-parent/dev.galasa.inttests.obr context=inttests/galasa-inttests-parent/dev.galasa.inttests.obr @@ -146,19 +145,15 @@ function publish_artifacts { cmd="mvn \ -Dgalasa.source.repo=https://development.galasa.dev/main/maven-repo/obr \ -Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \ - -Dgalasa.release.repo=file://$BASEDIR/temp \ - -Dgalasa.bootstrap=${bootstrap} \ - -Dgalasa.skip.deploytestcatalog=true \ - -Dgalasa.skip.bundletestcatalog=false \ - deploy dev.galasa:galasa-maven-plugin:deploytestcat \ + install " info "Using this command: $cmd" $cmd 2>&1 >> ${log_file} rc=$? ; if [[ "${rc}" != "0" ]]; then error "Failed to build ${project} log is at ${log_file}" ; exit 1 ; fi - success "Published to '${bootstrap}' OK" + success "Built OBR OK" } mkdir -p $BASEDIR/temp gradle_build -publish_artifacts \ No newline at end of file +build_obr \ No newline at end of file From 6ec9c6950595a6abefce2be3ed14d649661685cf Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Thu, 26 Sep 2024 13:28:33 +0100 Subject: [PATCH 3/5] Bump gson to 2.10.1 Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- galasa-inttests-parent/dev.galasa.inttests/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-inttests-parent/dev.galasa.inttests/build.gradle b/galasa-inttests-parent/dev.galasa.inttests/build.gradle index 2669dad..38d2bb2 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/build.gradle +++ b/galasa-inttests-parent/dev.galasa.inttests/build.gradle @@ -8,6 +8,6 @@ description = 'Galasa Integration Tests' version = '0.38.0' dependencies { - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.10.1' implementation 'commons-io:commons-io:2.9.0' } From 3e8ac82613d97bd53dea4f7d9f452b7dd7d0c6ac Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Thu, 26 Sep 2024 14:59:10 +0100 Subject: [PATCH 4/5] Bump parent version to 0.38.0 Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- galasa-inttests-parent/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galasa-inttests-parent/gradle.properties b/galasa-inttests-parent/gradle.properties index fd5a72b..060f564 100644 --- a/galasa-inttests-parent/gradle.properties +++ b/galasa-inttests-parent/gradle.properties @@ -1,6 +1,6 @@ galasaGroup=dev.galasa galasaName=galasa -galasaVersion=0.36.0 +galasaVersion=0.38.0 galasaSourceCompatibility=11 galasaTargetCompatibility=11 From 826ff774d5b2ddde22206fa1ffc4a4ac9af01577 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:07:11 +0100 Subject: [PATCH 5/5] Revert gradle plugin versions to 0.33.0 Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- galasa-inttests-parent/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/galasa-inttests-parent/build.gradle b/galasa-inttests-parent/build.gradle index 43ddb92..65aa9d2 100644 --- a/galasa-inttests-parent/build.gradle +++ b/galasa-inttests-parent/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'dev.galasa.githash' version '0.36.0' apply false - id 'dev.galasa.testcatalog' version '0.36.0' apply false - id 'dev.galasa.tests' version '0.36.0' apply false + id 'dev.galasa.githash' version '0.33.0' apply false + id 'dev.galasa.testcatalog' version '0.33.0' apply false + id 'dev.galasa.tests' version '0.33.0' apply false } subprojects {