diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a6f1b07..8e5ea2b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -121,12 +121,52 @@ jobs: env: ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} run: | - docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run main-inttests restart --kind Deployment --resource-name inttests-main --server argocd.galasa.dev - + for i in {1..10}; do + docker run \ + --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} \ + --rm ghcr.io/${{ env.NAMESPACE }}/argocdcli:main \ + app actions run main-inttests restart \ + --kind Deployment \ + --resource-name inttests-main \ + --server argocd.galasa.dev \ + --grpc-web \ + && exit 0 || sleep 10 + done + + echo "ArgoCD still uncontactable after 10 attempts." + exit 1 + - name: Wait for app health in ArgoCD # Skip this step for forks if: ${{ github.repository_owner == 'galasa-dev' }} env: ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }} run: | - docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app wait main-inttests --resource apps:Deployment:inttests-main --health --server argocd.galasa.dev + for i in {1..10}; do + docker run \ + --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} \ + --rm ghcr.io/${{ env.NAMESPACE }}/argocdcli:main \ + app wait main-inttests \ + --resource apps:Deployment:inttests-main \ + --health \ + --server argocd.galasa.dev \ + --grpc-web \ + && exit 0 || sleep 10 + done + + echo "ArgoCD still uncontactable after 10 attempts." + exit 1 + + report-failure: + # Skip this job for forks + if: ${{ failure() && github.repository_owner == 'galasa-dev' }} + name: Report failure in workflow + runs-on: ubuntu-latest + needs: [build-integrationtests] + + steps: + - name: Report failure in workflow to Slack + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + run : | + docker run --rm ghcr.io/galasa-dev/galasabld-ibm:main slackpost workflows --repo "integratedtests" --workflowName "${{ github.workflow }}" --workflowRunNum "${{ github.run_id }}" --ref "${{ env.BRANCH }}" --hook "${{ env.SLACK_WEBHOOK }}" \ No newline at end of file diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/artifact/AbstractArtifactLocal.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/artifact/AbstractArtifactLocal.java deleted file mode 100644 index 1f82879..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/artifact/AbstractArtifactLocal.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.artifact; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.Test; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractArtifactLocal { - - @Test - public void testArtifactIvtTest() throws Exception { - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.artifact.manager.ivt", - "dev.galasa.artifact.manager.ivt.ArtifactManagerIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - } - - abstract protected IGenericEcosystem getEcosystem(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/artifact/local/ArtifactLocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/artifact/local/ArtifactLocalJava11Ubuntu.java deleted file mode 100644 index 7f0daa8..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/artifact/local/ArtifactLocalJava11Ubuntu.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.artifact.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.artifact.AbstractArtifactLocal; -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; - -// @Test -@TestAreas({"artifactManager", "localecosystem","java11","ubuntu"}) -@Tags({"codecoverage"}) -public class ArtifactLocalJava11Ubuntu extends AbstractArtifactLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY") - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu) - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/artifact/local/isolated/ArtifactLocalJava11UbuntuIsolated.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/artifact/local/isolated/ArtifactLocalJava11UbuntuIsolated.java deleted file mode 100644 index c0b3515..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/artifact/local/isolated/ArtifactLocalJava11UbuntuIsolated.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.artifact.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.artifact.AbstractArtifactLocal; -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; - -// @Test -@TestAreas({"artifactManager", "localecosystem","java11","ubuntu","isolated"}) -public class ArtifactLocalJava11UbuntuIsolated extends AbstractArtifactLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Full) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu, capabilities = "isolated") - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/artifact/local/mvp/ArtifactLocalJava11UbuntuMvp.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/artifact/local/mvp/ArtifactLocalJava11UbuntuMvp.java deleted file mode 100644 index 68bd2ed..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/artifact/local/mvp/ArtifactLocalJava11UbuntuMvp.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.artifact.local.mvp; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.artifact.AbstractArtifactLocal; -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; - -// @Test -@TestAreas({"artifactManager", "localecosystem","java11","ubuntu","mvp"}) -public class ArtifactLocalJava11UbuntuMvp extends AbstractArtifactLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Mvp) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu, capabilities = "isolated") - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/AbstractCompilationLocal.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/AbstractCompilationLocal.java deleted file mode 100644 index a1936f3..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/AbstractCompilationLocal.java +++ /dev/null @@ -1,265 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.compilation; - -import static org.assertj.core.api.Assertions.assertThat; - -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardCopyOption; -import java.nio.file.StandardOpenOption; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.commons.logging.Log; -import org.apache.http.ConnectionClosedException; -import org.apache.http.HttpEntity; -import org.apache.http.client.methods.CloseableHttpResponse; - -import dev.galasa.BeforeClass; -import dev.galasa.ResultArchiveStoreContentType; -import dev.galasa.SetContentType; -import dev.galasa.Test; -import dev.galasa.artifact.TestBundleResourceException; -import dev.galasa.core.manager.Logger; -import dev.galasa.core.manager.RunName; -import dev.galasa.core.manager.StoredArtifactRoot; -import dev.galasa.core.manager.TestProperty; -import dev.galasa.framework.spi.ResourceUnavailableException; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.http.HttpClient; -import dev.galasa.http.IHttpClient; -import dev.galasa.ipnetwork.IpNetworkManagerException; -import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; -import dev.galasa.linux.ILinuxImage; -import dev.galasa.linux.LinuxManagerException; - -public abstract class AbstractCompilationLocal { - - @RunName - public String runName; - - @Logger - public Log logger; - - @HttpClient - public IHttpClient client; - - @StoredArtifactRoot - public Path storedArtifactRoot; - - protected Path testRunDirectory; - protected Path projectDirectory; - private Path gradleBin; - - @TestProperty(prefix = "gradle.zip",suffix = "location", required = true) - public String gradleZipLocation; - - public String gradleZipVersion; - - protected String javaHomeCommand; - - /* - * Initialise all resources needed for testing. - * - */ - @BeforeClass - public void setupTest() throws ResourceUnavailableException, IOException, LinuxManagerException, IpNetworkManagerException, TestBundleResourceException { - javaHomeCommand = "export JAVA_HOME=" + getJavaInstallation().getJavaHome(); - - testRunDirectory = getLinuxImage().getHome().resolve(runName); - - setProjectDirectory(); - - gradleZipVersion = getGradleVersion(); - gradleBin = installGradle(); - } - - - /* - * Extracts the version from the gradle zip path - */ - private String getGradleVersion() { - final String regex = "gradle-(\\d+\\.\\d+\\.\\d+)-bin\\.zip"; - - final Pattern pattern = Pattern.compile(regex, Pattern.MULTILINE); - final Matcher matcher = pattern.matcher(gradleZipLocation); - matcher.find(); - gradleZipVersion = matcher.group(1); - - return gradleZipVersion; - } - - /* - * Method for unpacking an archive on a remote image. - * - * @param archive Path to the remote archive - * @param target Path to the directory to which archive should be unpacked - */ - protected void unpackOnRemote(Path archive, Path target) throws IpNetworkManagerException, LinuxManagerException { - logger.trace("Unzipping archive \"" + archive.toString() + "\" to \"" + target.toString() + "\""); - String unpackRC = getLinuxImage().getCommandShell().issueCommand( - "unzip -q " + archive.toString() - + " -d " + target.toString() - + "; echo RC=$?" - ); - - logger.trace("Checking return code of unpack"); - assertThat(unpackRC).isEqualToIgnoringWhitespace("RC=0"); - } - - /* - * Method for downloading a resource from a http location. - * - * @param downloadLocation string containing the url of the resource to be downloaded - * @return tempFile the temporary location of the file that was downloaded. - */ - protected Path downloadHttp(String downloadLocation) throws ResourceUnavailableException { - - logger.trace("Retrieving Http Resource: " + downloadLocation); - - URI uri; - try { - uri = new URI(downloadLocation); - } catch (URISyntaxException e) { - throw new ResourceUnavailableException("Invalid Download Location: " + downloadLocation, e); - } - - client.setURI(uri); - - try (CloseableHttpResponse response = client.getFile(uri.getPath())) { - - Path archive = Files.createTempFile("galasa.test.compilation", ".temp"); - archive.toFile().deleteOnExit(); - - HttpEntity entity = response.getEntity(); - - Files.copy(entity.getContent(), archive, StandardCopyOption.REPLACE_EXISTING); - - return archive; - } catch (ConnectionClosedException e) { - logger.error("Transfer connection closed early, usually caused by network instability, marking as resource unavailable so can try again later",e); - throw new ResourceUnavailableException("Network error downloading from: " + uri.toString(), e); - } catch (Exception e) { - throw new ResourceUnavailableException("Unable to download from: " + uri.toString(), e); - } - } - - /* - * Installs gradle (Download locally, upload to image, and unzip on image), - * then returns the path to the gradle bin directory. - * - * @return gradleWorkingDir The path to the gradle installation directory. - */ - private Path installGradle() throws ResourceUnavailableException, LinuxManagerException, IOException, IpNetworkManagerException { - // Download Gradle - logger.info("Installing Gradle"); - logger.trace("Downloading Gradle Zip from: " + gradleZipLocation); - Path localGradleArchive = downloadHttp(gradleZipLocation); - Path runLocation = getLinuxImage().getHome().resolve(runName); - Path remoteGradleArchive = runLocation.resolve("gradle-" + gradleZipVersion + ".zip"); - Path remoteGradleDir = runLocation.resolve("gradle"); - - // Upload Gradle - logger.trace("Uploading gradle archive to remote image"); - logger.trace("Copying: " + localGradleArchive.toString() + " to " + remoteGradleArchive.toString()); - Files.copy(localGradleArchive, remoteGradleArchive); - - // Unzip Gradle - logger.trace("Unzipping gradle archive on remote image"); - unpackOnRemote(remoteGradleArchive, remoteGradleDir); - - Path gradleWorkingDir = remoteGradleDir.resolve("gradle-" + gradleZipVersion + "/bin"); - - logger.trace("Checking unpacked gradle version"); - String gradleVersion = getLinuxImage().getCommandShell().issueCommand( - javaHomeCommand + "; " + - gradleWorkingDir + "/gradle -v" - ); - - assertThat(gradleVersion).contains(gradleZipVersion); - - return gradleWorkingDir; - } - - - /* - * Runs and Gradle build against the prepared Simplatform code. - * Passes if "BUILD SUCCESSFUL" appears in the output. - * - */ - @Test - public void compile() throws Exception { - logger.info("Compilation Test"); - - logger.info("Running Gradle Build"); - - // Set Java Home, go to project directory, execute the unpackaged Gradle binary. - // Pass to the Gradle binary: - // * User home directory - // * Option to ensure output is logger friendly - // * The task(s) to be executed. - String buildCommand = javaHomeCommand + "; " - + "cd " + projectDirectory.toString() + "; " - + gradleBin.toString() + "/gradle " - + "-Dgradle.user.home=" + testRunDirectory + "/.gradle " - + "--console plain " - + "build"; - - logger.info("Issuing Command: " + buildCommand); - - String managerBuildResults = getLinuxImage().getCommandShell().issueCommand(buildCommand, 300000); - - assertThat(managerBuildResults).contains("BUILD SUCCESSFUL"); - logger.info("OUTPUT FOR TEST: " + managerBuildResults); - } - - /** - * Stores a file in the RAS. Function will retrieve the content from the file and store it the ras at a location realtive to the run directory. - * @param file Path to the file to be stored. - * - */ - protected void storeOutput(String prefix, Path file) throws IOException { - - assertThat(file.toString()).contains(testRunDirectory.toString()); - - // Match only the portion of the path *after* the test directory - Path requestPath = storedArtifactRoot.resolve( prefix + "/" + - file.toString().substring(testRunDirectory.toString().length()+1)); - - Files.write(requestPath, Files.readAllBytes(file), new SetContentType(ResultArchiveStoreContentType.TEXT), - StandardOpenOption.CREATE); - } - - /* - * Sets the project directory to run the gradle build against - * - */ - abstract protected void setProjectDirectory() throws ResourceUnavailableException, LinuxManagerException, IpNetworkManagerException, IOException, TestBundleResourceException; - - - /* - * @return ecosystem The ecosystem instance associated with the test. - * - */ - abstract protected IGenericEcosystem getEcosystem(); - - /* - * @return linuxImage The linux image instance associated with the test. - * - */ - abstract protected ILinuxImage getLinuxImage(); - - /* - * @return javaInstallation The java installation instance associated with the test. - * - */ - abstract protected IJavaUbuntuInstallation getJavaInstallation(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/offline/AbstractCompilationLocalOffline.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/offline/AbstractCompilationLocalOffline.java deleted file mode 100644 index 1f30161..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/offline/AbstractCompilationLocalOffline.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.compilation.offline; - -import java.io.IOException; -import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.HashMap; - -import dev.galasa.artifact.BundleResources; -import dev.galasa.artifact.IBundleResources; -import dev.galasa.artifact.TestBundleResourceException; -import dev.galasa.framework.spi.ResourceUnavailableException; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.inttests.compilation.AbstractCompilationLocal; -import dev.galasa.ipnetwork.IpNetworkManagerException; -import dev.galasa.linux.LinuxManagerException; - -public abstract class AbstractCompilationLocalOffline extends AbstractCompilationLocal { - - @BundleResources - public IBundleResources resources; - - @Override - protected void setProjectDirectory() throws ResourceUnavailableException, LinuxManagerException, IpNetworkManagerException, IOException, TestBundleResourceException { - projectDirectory = setupExampleProject(); - } - - private Path setupExampleProject() throws IOException, TestBundleResourceException { - logger.trace("Setting up example project"); - Path projectDir = testRunDirectory.resolve("helloworld"); - - HashMap parameters = new HashMap(); - parameters.put("PARENT_FOLDER_NAME", "helloworld"); - parameters.put("PACKAGENAME", "dev.galasa.compilation.test.helloworld"); - parameters.put("DEPENDENCIES", getProjectDependencies()); - parameters.put("REPO", ((ILocalEcosystem) getEcosystem()).getIsolatedDirectory() + "/maven"); - - Path settingsGradle = projectDir.resolve("settings.gradle"); - Path buildGradle = projectDir.resolve("build.gradle"); - Path javaSrcDir = projectDir.resolve("src/main/java/dev/galasa/compilation/test/helloworld"); - Path javaSrcFile = javaSrcDir.resolve("HelloWorld.java"); - - logger.trace("Creating files and directories: "); - logger.trace("Creating directory: " + projectDir.toString()); - Files.createDirectories(projectDir); - logger.trace("Creating file: " + settingsGradle.toString()); - Files.createFile(settingsGradle); - logger.trace("Creating file: " + buildGradle.toString()); - Files.createFile(buildGradle); - logger.trace("Creating directory: " + javaSrcDir.toString()); - Files.createDirectories(javaSrcDir); - logger.trace("Creating file: " + javaSrcFile.toString()); - Files.createFile(javaSrcFile); - - logger.trace("Writing data from example files to project directory"); - Files.write(settingsGradle, - resources.retrieveSkeletonFileAsString("offlinebuild/exampleSettings.gradle", parameters).getBytes()); - Files.write(buildGradle, - resources.retrieveSkeletonFileAsString("offlinebuild/exampleBuild.gradle", parameters).getBytes()); - Files.write(javaSrcFile, - resources.retrieveSkeletonFileAsString("offlinebuild/HelloWorld.java", parameters).getBytes()); - - storeOutput("project-files", settingsGradle); - storeOutput("project-files", buildGradle); - storeOutput("project-files", javaSrcFile); - - return projectDir; - } - - private String getProjectDependencies() throws TestBundleResourceException, IOException { - // Iterate dependencies - String[] managers = getManagers(); - StringBuilder sb = new StringBuilder(); - - logger.trace("Adding dependencies to build.gradle:"); - for (int i = 0; i < managers.length; i++) { - if (managers[i].equals("dev.galasa.selenium.manager")) { - - sb.append(" implementation('dev.galasa:dev.galasa.selenium.manager:0.+'){\n" + - " exclude group: 'com.squareup.okio', module: 'okio'\n" + - " exclude group: 'com.squareup.okhttp3', module: 'okhttp'\n" + - " exclude group: 'net.bytebuddy', module: 'byte-buddy'\n" + - " exclude group: 'org.apache.commons', module: 'commons-exec'\n" + - " exclude group: 'com.google.guava', module: 'guava'\n" + - " }\n"); - } else { - sb.append(" implementation 'dev.galasa:" + managers[i] + ":0.+'\n"); - } - logger.trace("Dependency: " + managers[i]); - } - logger.trace("Adding constraints to build.gradle:"); - sb.append( - " constraints {\n" + - " implementation('commons-codec:commons-codec:1.15'){\n" + - " because \"Force specific version of commons-codec for security reasons\"\n" + - " }\n" + - " implementation('org.apache.httpcomponents:httpcore:4.4.14'){\n" + - " because \"Force specific version of httpcore for security reasons\"\n" + - " }\n" + - " }\n"); - return sb.toString(); - } - - abstract protected String[] getManagers() throws TestBundleResourceException, IOException; - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/offline/isolated/CompilationLocalOfflineJava11UbuntuIsolated.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/offline/isolated/CompilationLocalOfflineJava11UbuntuIsolated.java deleted file mode 100644 index aff39b0..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/offline/isolated/CompilationLocalOfflineJava11UbuntuIsolated.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.compilation.offline.isolated; - -import java.io.IOException; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.artifact.TestBundleResourceException; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.compilation.offline.AbstractCompilationLocalOffline; -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; - -// @Test -@TestAreas({"compilation","localecosystem","java11","ubuntu","isolated"}) -public class CompilationLocalOfflineJava11UbuntuIsolated extends AbstractCompilationLocalOffline { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Full) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu, capabilities = "isolated") - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - - @Override - protected ILinuxImage getLinuxImage() { - return this.linuxImage; - } - - @Override - protected IJavaUbuntuInstallation getJavaInstallation() { - return this.java; - } - - @Override - protected String[] getManagers() throws TestBundleResourceException, IOException { - - String managerString = resources.retrieveFileAsString("offlinebuild/AllManagers.txt"); - - String[] managers = managerString.split("\\r?\\n"); - return managers; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/offline/mvp/CompilationLocalOfflineJava11UbuntuMVP.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/offline/mvp/CompilationLocalOfflineJava11UbuntuMVP.java deleted file mode 100644 index c26b4da..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/offline/mvp/CompilationLocalOfflineJava11UbuntuMVP.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.compilation.offline.mvp; - -import java.io.IOException; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.artifact.TestBundleResourceException; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.compilation.offline.AbstractCompilationLocalOffline; -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; - -// @Test -@TestAreas({"compilation","localecosystem","java11","ubuntu","mvp"}) -public class CompilationLocalOfflineJava11UbuntuMVP extends AbstractCompilationLocalOffline { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Mvp) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu, capabilities = "isolated") - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - - @Override - protected ILinuxImage getLinuxImage() { - return this.linuxImage; - } - - @Override - protected IJavaUbuntuInstallation getJavaInstallation() { - return this.java; - } - - @Override - protected String[] getManagers() throws TestBundleResourceException, IOException { - - String managerString = resources.retrieveFileAsString("offlinebuild/MVPManagers.txt"); - - String[] managers = managerString.split("\\r?\\n"); - return managers; - } - -} 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 deleted file mode 100644 index c01fc62..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/AbstractCompilationLocalSimBank.java +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.compilation.simbank; - -import static org.assertj.core.api.Assertions.assertThat; - -import java.io.IOException; -import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Path; -import dev.galasa.framework.spi.ResourceUnavailableException; -import dev.galasa.inttests.compilation.AbstractCompilationLocal; -import dev.galasa.ipnetwork.IpNetworkManagerException; -import dev.galasa.linux.LinuxManagerException; - -public abstract class AbstractCompilationLocalSimBank extends AbstractCompilationLocal { - - private String prefix = "dev.galasa.simbank"; - private String testProjectName = prefix + ".tests"; - private String managerProjectName = prefix + ".manager"; - - @Override - protected void setProjectDirectory() throws ResourceUnavailableException, LinuxManagerException, IpNetworkManagerException, IOException { - projectDirectory = setupSimPlatform(); - } - - /* - * Download simplatform (github main branch), unzipp simplatform, then structure - * and edit the directory and files it in such a way that they are usable by gradle. - * - * @return remoteDirectory the parent directory of the structured, edited, and usable simplatform project. - * - */ - private Path setupSimPlatform() throws ResourceUnavailableException, IOException, LinuxManagerException, IpNetworkManagerException { - logger.info("Downloading simplatform repository archive - main branch."); - Path localArchive = downloadHttp("https://github.com/galasa-dev/simplatform/archive/main.zip"); - - logger.info("Uploading simplatform repository archive to image"); - Path remoteArchive = testRunDirectory.resolve("simplatformArchive"); - Files.createDirectories(testRunDirectory); - - Path remoteUnpacked = testRunDirectory.resolve("simplatformUnpacked"); - Files.copy(localArchive, remoteArchive); - - logger.info("Unzipping simplatform repository archive"); - unpackOnRemote(remoteArchive, remoteUnpacked); - - logger.info("Setting up repository"); - Path simplatformParent = testRunDirectory.resolve("simplatform"); - Files.createDirectories(simplatformParent); - structureSimplatform(remoteUnpacked, simplatformParent); - createParentSettings(simplatformParent); - createGradleProperties(simplatformParent); - logger.trace("Successfully created gradle.properties"); - - outputFiles("simplatform-example", simplatformParent, true); - - refactorSimplatform(simplatformParent); - - outputFiles("simplatform-refactored", simplatformParent, false); - - return simplatformParent; - } - - private void outputFiles(String prefix, Path simplatformParent, boolean example) throws IOException { - - String ex = ""; - - if (example) { - ex = "-example"; - } else { - storeOutput(prefix, simplatformParent.resolve("settings.gradle")); - storeOutput(prefix, simplatformParent.resolve(".gradle/gradle.properties")); - } - - storeOutput(prefix, simplatformParent.resolve(managerProjectName + "/settings" + ex + ".gradle")); - storeOutput(prefix, simplatformParent.resolve(managerProjectName + "/build" + ex + ".gradle")); - storeOutput(prefix, simplatformParent.resolve(managerProjectName + "/bnd" + ex + ".bnd")); - storeOutput(prefix, simplatformParent.resolve(testProjectName + "/settings" + ex + ".gradle")); - storeOutput(prefix, simplatformParent.resolve(testProjectName + "/build" + ex + ".gradle")); - storeOutput(prefix, simplatformParent.resolve(testProjectName + "/bnd" + ex + ".bnd")); - } - - /* - * Parent method for renaming of files and changing of prefixes. - * To be overridden by subclasses to make further changes (e.g. building from isolated zip requires more changes) - * - * @param simplatformParent the path to the parent directory of the simplatform project - */ - protected void refactorSimplatform(Path simplatformParent) throws IOException { - renameFiles(simplatformParent); - changeAllPrefixes(simplatformParent); - } - - /* - * Retrieves the necessary source files from the unpacked simplatform archive and - * structures them in a parent directory, along with a parent settings file. - * - * @param unpackedDir The directory containing he unpackaged simplatform archive - * @return parentDir The parent directory of the newly structured simplatform parent project - * - */ - private void structureSimplatform(Path unpackedDir, Path simplatformParent) throws IOException, IpNetworkManagerException, LinuxManagerException { - // Create new (temp) directory - logger.trace("Creating project parent directory (for manager and tests)"); - - // Get Manager Files - logger.trace("Copying managers source into parent directory"); - moveFilesOnRemote( - unpackedDir.resolve("simplatform-main/galasa-simbank-tests/" + managerProjectName), - simplatformParent.resolve(managerProjectName) - ); - - // Get Tests - logger.trace("Copying tests source into parent directory"); - moveFilesOnRemote( - unpackedDir.resolve("simplatform-main/galasa-simbank-tests/" + testProjectName), - simplatformParent.resolve(testProjectName) - ); - - // Create an empty gradle home folder, so we can add a properties files to it to control the build. - logger.trace("Creating an empty .gradle in the parent directory so we have a home for gradle properties."); - mkdirOnRemote( simplatformParent.resolve(".gradle") ); - } - - /* - * Creates a parent settings file within the specified directory - * - * @param simplatformParent Directory target for new settings file - * - */ - private void createParentSettings(Path simplatformParent) throws IOException { - logger.trace("Creating settings.gradle"); - Path parentSettingsFile = simplatformParent.resolve("settings.gradle"); - - StringBuilder settingsSB = new StringBuilder(); - settingsSB.append("include '"); - settingsSB.append(managerProjectName); - settingsSB.append("'\n"); - settingsSB.append("include '"); - settingsSB.append(testProjectName); - settingsSB.append("'\n"); - Files.write(parentSettingsFile, settingsSB.toString().getBytes()); - } - - /* - * Moves file (source) to target. - * - * @param source Path: The file to be moved - * @param target Path: The location to be moved to - */ - private void moveFilesOnRemote(Path source, Path target) throws IpNetworkManagerException, LinuxManagerException { - String command = "mv " + source.toString() + " " + target.toString() + "; echo RC=$?"; - logger.info("issuing command: " + command); - String rc = getLinuxImage().getCommandShell().issueCommand(command); - assertThat(rc).isEqualToIgnoringWhitespace("RC=0"); - } - - private void mkdirOnRemote(Path target) throws IpNetworkManagerException, LinuxManagerException { - String command = "mkdir -p " + target.toString() + "; echo RC=$?"; - logger.info("issuing command: " + command); - String rc = getLinuxImage().getCommandShell().issueCommand(command); - assertThat(rc).isEqualToIgnoringWhitespace("RC=0"); - } - - /* - * Renames the example files with names that Gradle will recognise. - * - * @param simplatformParent The directory of the Simplatform project - */ - protected void renameFiles(Path simplatformParent) throws IOException { - logger.trace("Renaming example files"); - Path managerDir = simplatformParent.resolve(managerProjectName); - Path testDir = simplatformParent.resolve(testProjectName); - - // Managers - Files.move(managerDir.resolve("settings-example.gradle"), managerDir.resolve("settings.gradle")); - Files.move(managerDir.resolve("build-example.gradle"), managerDir.resolve("build.gradle")); - Files.move(managerDir.resolve("bnd-example.bnd"), managerDir.resolve("bnd.bnd")); - - // Tests - Files.move(testDir.resolve("settings-example.gradle"), testDir.resolve("settings.gradle")); - Files.move(testDir.resolve("build-example.gradle"), testDir.resolve("build.gradle")); - Files.move(testDir.resolve("bnd-example.bnd"), testDir.resolve("bnd.bnd")); - - } - - /* - * Renames the prefix placeholders within the build and settings files of the - * manager and test projects. - * - * @param simplatformParent The directory of the simplatform project - */ - protected void changeAllPrefixes(Path simplatformParent) throws IOException { - // Manager - changePrefix(simplatformParent.resolve(managerProjectName + "/build.gradle")); - changePrefix(simplatformParent.resolve(managerProjectName + "/settings.gradle")); - // Tests - changePrefix(simplatformParent.resolve(testProjectName + "/build.gradle")); - changePrefix(simplatformParent.resolve(testProjectName + "/settings.gradle")); - } - - /* - * Renames the prefix placeholders within the specified file - * - * @param file The file in which the prefix will be changed. - */ - private void changePrefix(Path file) throws IOException { - String incumbent = "%%prefix%%"; - String fileData = new String(Files.readAllBytes(file), Charset.defaultCharset()); - fileData = fileData.replace(incumbent, prefix); - Files.write(file, fileData.getBytes()); - logger.trace("Changing prefix (" + incumbent + ") to \"" + prefix + "\" in file: " + file.toString()); - } - - /* - * Creates a Gradle properties file within the specified directory - * - * @param simplatformParent The directory of the simplatform project - * - */ - private void createGradleProperties(Path simplatformParent) throws IOException { - logger.trace("Creating gradle.properties"); - Path gradlePropertiesFile = simplatformParent.resolve(".gradle/gradle.properties"); - - StringBuilder gradlePropertiesSB = new StringBuilder(); - gradlePropertiesSB.append("sourceMaven=https://development.galasa.dev/main/maven-repo/obr/"); - - Files.write(gradlePropertiesFile, gradlePropertiesSB.toString().getBytes()); - } - - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/AbstractCompilationLocalSimBankOffline.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/AbstractCompilationLocalSimBankOffline.java deleted file mode 100644 index 55ad289..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/AbstractCompilationLocalSimBankOffline.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.compilation.simbank; - -import java.io.IOException; -import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import dev.galasa.galasaecosystem.ILocalEcosystem; - -public abstract class AbstractCompilationLocalSimBankOffline extends AbstractCompilationLocalSimBank { - - @Override - protected void refactorSimplatform(Path simplatformParent) throws IOException { - renameFiles(simplatformParent); - changeAllPrefixes(simplatformParent); - - Path managerBuildGradle = simplatformParent.resolve("dev.galasa.simbank.manager/build.gradle"); - Path testBuildGradle = simplatformParent.resolve("dev.galasa.simbank.tests/build.gradle"); - Path parentSettings = simplatformParent.resolve("settings.gradle"); - - // Alter project parent - addPluginManagementRepo(parentSettings); - - // Alter manager project - updateMavenRepo(managerBuildGradle); - addDependencyConstraints(managerBuildGradle); - - // Alter test project - updateMavenRepo(testBuildGradle); - // Add a list of managers to the test(s) - addDependencyConstraints(testBuildGradle); - addImplementationConstraints(testBuildGradle); - } - - /* - * For use when changing source code to work with the isolated zip (either mvp or full). - * Specify a file to work against. This method will take the contents of that file, and - * replace occurrences of mavenCentral() with the appropriate local maven repository closure. - * - * @param fileToChange the path to the file that needs updating - */ - protected void updateMavenRepo(Path fileToChange) throws IOException { - String fileData = new String(Files.readAllBytes(fileToChange), Charset.defaultCharset()); - logger.info("Replacing occurences of mavenCentral() with a link to the unzipped archive in file: " - + fileToChange.getName(fileToChange.getNameCount()-2) + "/" + fileToChange.getFileName()); - fileData = fileData.replace("mavenCentral()", - "maven {\n" + - " url=\"file://" + ((ILocalEcosystem) getEcosystem()).getIsolatedDirectory() + "/maven\"\n" + - " }" - ); - Files.write(fileToChange, fileData.getBytes()); - } - - /* - * For use when changing source code to work with the isolated zip (either mvp or full). - * Specify a file to work against. This method will take insert a pluginManagement closure at - * the beginning of that file. - * - * @param gradleSettingsFile the path to the file that needs updating - */ - protected void addPluginManagementRepo (Path gradleSettingsFile) throws IOException { - logger.info("Adding pluginManagement closure to: " - + gradleSettingsFile.getName(gradleSettingsFile.getNameCount()-2) + "/" + gradleSettingsFile.getFileName()); - - String fileData = new String(Files.readAllBytes(gradleSettingsFile), Charset.defaultCharset()); - String pluginClosure = "pluginManagement {\n" + - " repositories {\n" + - " maven {\n" + - " url=\"file://" + ((ILocalEcosystem) getEcosystem()).getIsolatedDirectory() + "/maven\"\n" + - " }\n" + - " }\n" + - "}\n\n"; - Files.write(gradleSettingsFile, (pluginClosure.concat(fileData)).getBytes()); - } - - /* - * For use when changing source code to work with the isolated zip (either mvp or full). - * Specify a file to work against. This method will take insert a constraints closure within - * the dependencies closure of that file. - * - * NOTE: enforces explicit versions of commons-coden and httpcore - * - * @param fileToChange the path to the file that needs updating - */ - protected void addDependencyConstraints(Path fileToChange) throws IOException { - logger.info("Adding constraints (for http packages) to: " - + fileToChange.getName(fileToChange.getNameCount()-2) + "/" + fileToChange.getFileName()); - - String fileData = new String(Files.readAllBytes(fileToChange), Charset.defaultCharset()); - String constraints = - " constraints {\n" + - " implementation('commons-codec:commons-codec:1.15'){\n" + - " because \"Force specific version of commons-codec for security reasons\"\n" + - " }\n" + - " implementation('org.apache.httpcomponents:httpcore:4.4.14'){\n" + - " because \"Force specific version of httpcore for security reasons\"\n" + - " }\n" + - " }\n"; - - // Regex Matches: - // Match 1: The dependencies closure, as well as whatever is inside it, up until just before the final, closing, curly brace. - // Match 2: The final, closing, curly brace. - String regex = "(dependencies \\{[\\n\\r\\sa-zA-Z0-9\\'\\.\\:\\+\\-\\(\\)]+)(\\})"; - Pattern pattern = Pattern.compile(regex, Pattern.MULTILINE); - Matcher matcher = pattern.matcher(fileData); - - - if(!matcher.find()) { - throw new IOException("Match not found: " + regex + " => " + fileData); - } - // Insert the constraints closure between match 1 (dependencies) and match 2 (closing brace) - fileData = fileData.replace(matcher.group(0), matcher.group(1) + constraints + matcher.group(2)); - - Files.write(fileToChange, fileData.getBytes()); - } - - /* - * For use when changing source code to work with the isolated zip (either mvp or full). - * Specify a file to work against. This method will alter the selenium manager depedency - * to exclude several unnecessary packages that aren't available in the zip. - * - * @param fileToChange the path to the file that needs updating - */ - protected void addImplementationConstraints(Path fileToChange) throws IOException { - logger.info("Adding constraints (for selenium manager) to: " - + fileToChange.getName(fileToChange.getNameCount()-2) + "/" + fileToChange.getFileName()); - - String fileData = new String(Files.readAllBytes(fileToChange), Charset.defaultCharset()); - - String constraints = - " implementation('dev.galasa:dev.galasa.selenium.manager:0.+'){\n" + - " exclude group: 'com.squareup.okio', module: 'okio'\n" + - " exclude group: 'com.squareup.okhttp3', module: 'okhttp'\n" + - " exclude group: 'net.bytebuddy', module: 'byte-buddy'\n" + - " exclude group: 'org.apache.commons', module: 'commons-exec'\n" + - " exclude group: 'com.google.guava', module: 'guava'\n" + - " }"; - - // Regex Matches: - // Match 1: The dependencies closure, as well as whatever is inside it, up until just before the final, closing, curly brace. - // Match 2: The final, closing, curly brace. - String regex = "implementation\\s\\'dev\\.galasa\\:dev\\.galasa\\.selenium\\.manager\\:0\\.\\+\\'"; - Pattern pattern = Pattern.compile(regex, Pattern.MULTILINE); - Matcher matcher = pattern.matcher(fileData); - matcher.find(); - // Insert the constraints closure between match 1 (dependencies) and match 2 (closing brace) - fileData = fileData.replace(matcher.group(0), constraints); - - Files.write(fileToChange, fileData.getBytes()); - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/local/offline/isolated/CompilationLocalJava11UbuntuIsolated.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/local/offline/isolated/CompilationLocalJava11UbuntuIsolated.java deleted file mode 100644 index a41c216..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/local/offline/isolated/CompilationLocalJava11UbuntuIsolated.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.compilation.simbank.local.offline.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.compilation.simbank.AbstractCompilationLocalSimBankOffline; -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; - -// @Test -@TestAreas({"compilation","localecosystem","java11","ubuntu","isolated"}) -public class CompilationLocalJava11UbuntuIsolated extends AbstractCompilationLocalSimBankOffline { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Full) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu, capabilities = "isolated") - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - - @Override - protected ILinuxImage getLinuxImage() { - return this.linuxImage; - } - - @Override - protected IJavaUbuntuInstallation getJavaInstallation() { - return this.java; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/local/offline/mvp/CompilationLocalJava11UbuntuMvp.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/local/offline/mvp/CompilationLocalJava11UbuntuMvp.java deleted file mode 100644 index a8f66a4..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/local/offline/mvp/CompilationLocalJava11UbuntuMvp.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.compilation.simbank.local.offline.mvp; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.compilation.simbank.AbstractCompilationLocalSimBankOffline; -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; - -// @Test -@TestAreas({"compilation","localecosystem","java11","ubuntu","mvp"}) -public class CompilationLocalJava11UbuntuMvp extends AbstractCompilationLocalSimBankOffline { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Mvp) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu, capabilities = "isolated") - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - - @Override - protected ILinuxImage getLinuxImage() { - return this.linuxImage; - } - - @Override - protected IJavaUbuntuInstallation getJavaInstallation() { - return this.java; - } - -} 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 deleted file mode 100644 index a08376d..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/compilation/simbank/local/online/CompilationLocalJava11Ubuntu.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.compilation.simbank.local.online; - -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.compilation.simbank.AbstractCompilationLocalSimBank; -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; - - -// @Test -@TestAreas({"compilation","localecosystem","java11","ubuntu"}) -public class CompilationLocalJava11Ubuntu extends AbstractCompilationLocalSimBank { - - @LocalEcosystem(linuxImageTag = "PRIMARY") - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu) - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - - @Override - protected ILinuxImage getLinuxImage() { - return this.linuxImage; - } - - @Override - protected IJavaUbuntuInstallation getJavaInstallation() { - return this.java; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/core/AbstractCoreLocal.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/core/AbstractCoreLocal.java deleted file mode 100644 index 658b829..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/core/AbstractCoreLocal.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.core; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.Test; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractCoreLocal { - - @Test - public void testCoreIvtTest() throws Exception { - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.core.manager.ivt", - "dev.galasa.core.manager.ivt.CoreManagerIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - } - - abstract protected IGenericEcosystem getEcosystem(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/core/local/CoreLocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/core/local/CoreLocalJava11Ubuntu.java deleted file mode 100644 index 1b485ff..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/core/local/CoreLocalJava11Ubuntu.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.core.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.core.AbstractCoreLocal; -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; - -// @Test -@TestAreas({"coreManager","localecosystem","java11","ubuntu"}) -@Tags({"codecoverage","pipelinetest"}) -public class CoreLocalJava11Ubuntu extends AbstractCoreLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY") - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu) - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/core/local/isolated/CoreLocalJava11UbuntuIsolated.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/core/local/isolated/CoreLocalJava11UbuntuIsolated.java deleted file mode 100644 index 6d9f9aa..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/core/local/isolated/CoreLocalJava11UbuntuIsolated.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.core.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.core.AbstractCoreLocal; -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; - -// @Test -@TestAreas({"coreManager","localecosystem","java11","ubuntu","isolated"}) -public class CoreLocalJava11UbuntuIsolated extends AbstractCoreLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Full) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu, capabilities = "isolated") - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/core/local/mvp/CoreLocalJava11UbuntuMvp.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/core/local/mvp/CoreLocalJava11UbuntuMvp.java deleted file mode 100644 index 120009c..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/core/local/mvp/CoreLocalJava11UbuntuMvp.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.core.local.mvp; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.core.AbstractCoreLocal; -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; - -// @Test -@TestAreas({"coreManager","localecosystem","java11","ubuntu","mvp"}) -public class CoreLocalJava11UbuntuMvp extends AbstractCoreLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Mvp) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu, capabilities = "isolated") - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/http/AbstractHttpLocal.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/http/AbstractHttpLocal.java deleted file mode 100644 index 860feb6..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/http/AbstractHttpLocal.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.http; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.Test; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractHttpLocal { - - @Test - public void testHttpIvtTest() throws Exception { - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.http.manager.ivt", - "dev.galasa.http.manager.ivt.HttpManagerIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - } - - abstract protected IGenericEcosystem getEcosystem(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/http/local/HttpLocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/http/local/HttpLocalJava11Ubuntu.java deleted file mode 100644 index 144a96d..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/http/local/HttpLocalJava11Ubuntu.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.http.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.http.AbstractHttpLocal; -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; - -// @Test -@TestAreas({"httpManager","localecosystem","java11","ubuntu"}) -@Tags({"codecoverage"}) -public class HttpLocalJava11Ubuntu extends AbstractHttpLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY") - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu) - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @Override - protected IGenericEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/simbank/AbstractSimBankLocal.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/simbank/AbstractSimBankLocal.java deleted file mode 100644 index 260b8a1..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/simbank/AbstractSimBankLocal.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.simbank; - -import static org.assertj.core.api.Assertions.assertThat; - -import org.apache.commons.logging.Log; - -import com.google.gson.JsonObject; - -import dev.galasa.Test; -import dev.galasa.core.manager.Logger; -import dev.galasa.galasaecosystem.GalasaEcosystemManagerException; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.inttests.TestException; -import dev.galasa.ipnetwork.IpNetworkManagerException; - -public abstract class AbstractSimBankLocal { - - @Logger - public Log logger; - - @Test - public void testSimbankIvt() throws GalasaEcosystemManagerException, InterruptedException, TestException, IpNetworkManagerException { - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.simbank.tests", - "dev.galasa.simbank.tests.SimBankIVT", - null, - null, - "simbank", - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - - logger.info("cache diags\n" + getEcosystem().getCommandShell().issueCommand("ls -l .galasa/felix-cache/")); - } - - @Test - public void testBasicAccountCreditTest() throws GalasaEcosystemManagerException, InterruptedException, TestException, IpNetworkManagerException { - logger.info("cache diags\n" + getEcosystem().getCommandShell().issueCommand("ls -l .galasa/felix-cache/")); - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.simbank.tests", - "dev.galasa.simbank.tests.BasicAccountCreditTest", - null, - null, - "simbank", - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - logger.info("cache diags\n" + getEcosystem().getCommandShell().issueCommand("ls -l .galasa/felix-cache/")); - } - - @Test - public void testProvisionedAccountCreditTests() throws GalasaEcosystemManagerException, InterruptedException, TestException, IpNetworkManagerException { - logger.info("cache diags\n" + getEcosystem().getCommandShell().issueCommand("ls -l .galasa/felix-cache/")); - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.simbank.tests", - "dev.galasa.simbank.tests.ProvisionedAccountCreditTests", - null, - null, - "simbank", - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - logger.info("cache diags\n" + getEcosystem().getCommandShell().issueCommand("ls -l .galasa/felix-cache/")); - } - - abstract protected ILocalEcosystem getEcosystem(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/simbank/local/SimBankLocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/simbank/local/SimBankLocalJava11Ubuntu.java deleted file mode 100644 index 3f68223..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/simbank/local/SimBankLocalJava11Ubuntu.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.simbank.local; - -import dev.galasa.Tags; -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.simbank.AbstractSimBankLocal; -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; - -// @Test -@TestAreas({"simplatform","localecosystem","java11","ubuntu"}) -@Tags({"codecoverage"}) -public class SimBankLocalJava11Ubuntu extends AbstractSimBankLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", startSimPlatform = true) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu) - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @Override - protected ILocalEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/simbank/local/isolated/SimBankLocalJava11UbuntuIsolated.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/simbank/local/isolated/SimBankLocalJava11UbuntuIsolated.java deleted file mode 100644 index 037f6dc..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/simbank/local/isolated/SimBankLocalJava11UbuntuIsolated.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.simbank.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.simbank.AbstractSimBankLocal; -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; - -// @Test -@TestAreas({"simplatform","localecosystem","java11","ubuntu","isolated"}) -public class SimBankLocalJava11UbuntuIsolated extends AbstractSimBankLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", startSimPlatform = true, isolationInstallation = IsolationInstallation.Full) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu) - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @Override - protected ILocalEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/simbank/local/mvp/SimBankLocalJava11UbuntuMvp.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/simbank/local/mvp/SimBankLocalJava11UbuntuMvp.java deleted file mode 100644 index f6a1da0..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/simbank/local/mvp/SimBankLocalJava11UbuntuMvp.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.simbank.local.mvp; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.simbank.AbstractSimBankLocal; -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; - -// @Test -@TestAreas({"simplatform","localecosystem","java11","ubuntu","mvp"}) -public class SimBankLocalJava11UbuntuMvp extends AbstractSimBankLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", startSimPlatform = true, isolationInstallation = IsolationInstallation.Mvp) - public ILocalEcosystem ecosystem; - - @LinuxImage(operatingSystem = OperatingSystem.ubuntu) - public ILinuxImage linuxImage; - - @JavaUbuntuInstallation(javaVersion = JavaVersion.v11) - public IJavaUbuntuInstallation java; - - @Override - protected ILocalEcosystem getEcosystem() { - return this.ecosystem; - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zos/AbstractZosLocal.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zos/AbstractZosLocal.java deleted file mode 100644 index b43291d..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zos/AbstractZosLocal.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zos; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.Test; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractZosLocal { - - @Test - public void testCoreIvtTest() throws Exception { - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.zos.manager.ivt", - "dev.galasa.zos.manager.ivt.ZosManagerIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - } - - abstract protected IGenericEcosystem getEcosystem(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zos/local/ZosLocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zos/local/ZosLocalJava11Ubuntu.java deleted file mode 100644 index d482ea9..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zos/local/ZosLocalJava11Ubuntu.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zos.local; - -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.zos.AbstractZosLocal; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu"}) -public class ZosLocalJava11Ubuntu extends AbstractZosLocal { - - @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/zos/local/isolated/ZosLocalJava11UbuntuIsolated.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zos/local/isolated/ZosLocalJava11UbuntuIsolated.java deleted file mode 100644 index e2df0eb..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zos/local/isolated/ZosLocalJava11UbuntuIsolated.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zos.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zos.AbstractZosLocal; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","isolated"}) -public class ZosLocalJava11UbuntuIsolated extends AbstractZosLocal { - - @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/zos/local/mvp/ZosLocalJava11UbuntuMvp.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zos/local/mvp/ZosLocalJava11UbuntuMvp.java deleted file mode 100644 index 81d1db3..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zos/local/mvp/ZosLocalJava11UbuntuMvp.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zos.local.mvp; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zos.AbstractZosLocal; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","mvp"}) -public class ZosLocalJava11UbuntuMvp extends AbstractZosLocal { - - @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/zos3270/AbstractZos3270Local.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zos3270/AbstractZos3270Local.java deleted file mode 100644 index b553343..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zos3270/AbstractZos3270Local.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zos3270; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.BeforeClass; -import dev.galasa.Test; -import dev.galasa.core.manager.CoreManager; -import dev.galasa.core.manager.ICoreManager; -import dev.galasa.galasaecosystem.GalasaEcosystemManagerException; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractZos3270Local { - - @CoreManager - public ICoreManager coreManager; - - - @BeforeClass - public void setupRunID() throws GalasaEcosystemManagerException { - String runName = coreManager.getRunName(); - getEcosystem().setCpsProperty("test.IVT.RUN.NAME", runName); - } - - @Test - public void testZos3270IvtTest() throws Exception { - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.zos3270.manager.ivt", - "dev.galasa.zos3270.manager.ivt.Zos3270IVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - } - - abstract protected IGenericEcosystem getEcosystem(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zos3270/local/Zos3270LocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zos3270/local/Zos3270LocalJava11Ubuntu.java deleted file mode 100644 index 512deb5..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zos3270/local/Zos3270LocalJava11Ubuntu.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zos3270.local; - -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.zos3270.AbstractZos3270Local; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zos3270Manager", "localecosystem","java11","ubuntu"}) -public class Zos3270LocalJava11Ubuntu extends AbstractZos3270Local { - - @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/zosBatch/AbstractZosBatchLocalRSE.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/AbstractZosBatchLocalRSE.java deleted file mode 100644 index 4835408..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/AbstractZosBatchLocalRSE.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosBatch; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.Test; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractZosBatchLocalRSE { - - @Test - public void testZosBatchIvtTestRSE() throws Exception { - - //Use RSE batch - getEcosystem().setCpsProperty("zos.bundle.extra.batch.manager", "dev.galasa.zosbatch.rseapi.manager"); - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.zos.manager.ivt", - "dev.galasa.zos.manager.ivt.ZosManagerBatchIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - } - - abstract protected IGenericEcosystem getEcosystem(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/AbstractZosBatchLocalZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/AbstractZosBatchLocalZosmf.java deleted file mode 100644 index 51225d7..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/AbstractZosBatchLocalZosmf.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosBatch; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.Test; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractZosBatchLocalZosmf { - - @Test - public void testZosBatchTestZOSMF() throws Exception { - - //default to z/OSMF batch - getEcosystem().setCpsProperty("zos.bundle.extra.batch.manager", "dev.galasa.zosbatch.zosmf.manager"); - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.zos.manager.ivt", - "dev.galasa.zos.manager.ivt.ZosManagerBatchIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - } - - abstract protected IGenericEcosystem getEcosystem(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/local/ZosBatchLocalJava11UbuntuRse.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/local/ZosBatchLocalJava11UbuntuRse.java deleted file mode 100644 index b3d4707..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/local/ZosBatchLocalJava11UbuntuRse.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosBatch.local; - -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.zosBatch.AbstractZosBatchLocalRSE; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu"}) -//@Tags({"codecoverage"}) - disabled until rse stable -public class ZosBatchLocalJava11UbuntuRse extends AbstractZosBatchLocalRSE { - - @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/zosBatch/local/ZosBatchLocalJava11UbuntuZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/local/ZosBatchLocalJava11UbuntuZosmf.java deleted file mode 100644 index 1e76575..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/local/ZosBatchLocalJava11UbuntuZosmf.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosBatch.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.zosBatch.AbstractZosBatchLocalZosmf; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu"}) -@Tags({"codecoverage"}) -public class ZosBatchLocalJava11UbuntuZosmf extends AbstractZosBatchLocalZosmf { - - @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/zosBatch/local/isolated/ZosBatchLocalJava11UbuntuIsolatedRse.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/local/isolated/ZosBatchLocalJava11UbuntuIsolatedRse.java deleted file mode 100644 index 4c4a249..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/local/isolated/ZosBatchLocalJava11UbuntuIsolatedRse.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosBatch.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosBatch.AbstractZosBatchLocalRSE; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","isolated"}) -public class ZosBatchLocalJava11UbuntuIsolatedRse extends AbstractZosBatchLocalRSE { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Full, addDefaultZosImage = "PRIMARY") - 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/zosBatch/local/isolated/ZosBatchLocalJava11UbuntuIsolatedZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/local/isolated/ZosBatchLocalJava11UbuntuIsolatedZosmf.java deleted file mode 100644 index c6b9c14..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/local/isolated/ZosBatchLocalJava11UbuntuIsolatedZosmf.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosBatch.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosBatch.AbstractZosBatchLocalZosmf; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","isolated"}) -public class ZosBatchLocalJava11UbuntuIsolatedZosmf extends AbstractZosBatchLocalZosmf { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Full, addDefaultZosImage = "PRIMARY") - 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/zosBatch/local/mvp/ZosBatchLocalJava11UbuntuMvpRse.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/local/mvp/ZosBatchLocalJava11UbuntuMvpRse.java deleted file mode 100644 index b32c240..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/local/mvp/ZosBatchLocalJava11UbuntuMvpRse.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosBatch.local.mvp; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosBatch.AbstractZosBatchLocalRSE; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","mvp"}) -public class ZosBatchLocalJava11UbuntuMvpRse extends AbstractZosBatchLocalRSE { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Mvp, addDefaultZosImage = "PRIMARY") - 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/zosBatch/local/mvp/ZosBatchLocalJava11UbuntuMvpZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/local/mvp/ZosBatchLocalJava11UbuntuMvpZosmf.java deleted file mode 100644 index 4bca953..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/local/mvp/ZosBatchLocalJava11UbuntuMvpZosmf.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosBatch.local.mvp; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosBatch.AbstractZosBatchLocalZosmf; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","mvp"}) -public class ZosBatchLocalJava11UbuntuMvpZosmf extends AbstractZosBatchLocalZosmf { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Mvp, addDefaultZosImage = "PRIMARY") - 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/zosFile/AbstractZosFileLocalRSE.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/AbstractZosFileLocalRSE.java deleted file mode 100644 index 6d589e3..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/AbstractZosFileLocalRSE.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFile; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.Test; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractZosFileLocalRSE { - - - @Test - public void testZosFileIvtTestRSE() throws Exception { - getEcosystem().setCpsProperty("zos.bundle.extra.file.manager", "dev.galasa.zosfile.rseapi.manager"); - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.zos.manager.ivt", - "dev.galasa.zos.manager.ivt.ZosManagerFileIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - } - - abstract protected IGenericEcosystem getEcosystem(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/AbstractZosFileLocalZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/AbstractZosFileLocalZosmf.java deleted file mode 100644 index faebf34..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/AbstractZosFileLocalZosmf.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFile; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.Test; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractZosFileLocalZosmf { - - @Test - public void testZosFileIvtTestZOSMF() throws Exception { - getEcosystem().setCpsProperty("zos.bundle.extra.file.manager", "dev.galasa.zosfile.zosmf.manager"); - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.zos.manager.ivt", - "dev.galasa.zos.manager.ivt.ZosManagerFileIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - } - - abstract protected IGenericEcosystem getEcosystem(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/local/ZosFileLocalJava11UbuntuRse.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/local/ZosFileLocalJava11UbuntuRse.java deleted file mode 100644 index af1f436..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/local/ZosFileLocalJava11UbuntuRse.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFile.local; - -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.zosFile.AbstractZosFileLocalRSE; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu"}) -//@Tags({"codecoverage"}) disabled until RSE stable -public class ZosFileLocalJava11UbuntuRse extends AbstractZosFileLocalRSE { - - @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/zosFile/local/ZosFileLocalJava11UbuntuZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/local/ZosFileLocalJava11UbuntuZosmf.java deleted file mode 100644 index aaecabf..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/local/ZosFileLocalJava11UbuntuZosmf.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFile.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.zosFile.AbstractZosFileLocalZosmf; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu"}) -@Tags({"codecoverage"}) -public class ZosFileLocalJava11UbuntuZosmf extends AbstractZosFileLocalZosmf { - - @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/zosFile/local/isolated/ZosFileLocalJava11UbuntuIsolatedRse.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/local/isolated/ZosFileLocalJava11UbuntuIsolatedRse.java deleted file mode 100644 index 9fb49a6..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/local/isolated/ZosFileLocalJava11UbuntuIsolatedRse.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFile.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosFile.AbstractZosFileLocalRSE; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","isolated"}) -public class ZosFileLocalJava11UbuntuIsolatedRse extends AbstractZosFileLocalRSE { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Full, addDefaultZosImage = "PRIMARY") - 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/zosFile/local/isolated/ZosFileLocalJava11UbuntuIsolatedZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/local/isolated/ZosFileLocalJava11UbuntuIsolatedZosmf.java deleted file mode 100644 index 0dae22f..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/local/isolated/ZosFileLocalJava11UbuntuIsolatedZosmf.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFile.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosFile.AbstractZosFileLocalZosmf; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","isolated"}) -public class ZosFileLocalJava11UbuntuIsolatedZosmf extends AbstractZosFileLocalZosmf { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Full, addDefaultZosImage = "PRIMARY") - 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/zosFile/local/mvp/ZosFileLocalJava11UbuntuMvpRse.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/local/mvp/ZosFileLocalJava11UbuntuMvpRse.java deleted file mode 100644 index 8a256ad..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/local/mvp/ZosFileLocalJava11UbuntuMvpRse.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFile.local.mvp; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosFile.AbstractZosFileLocalRSE; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","mvp"}) -public class ZosFileLocalJava11UbuntuMvpRse extends AbstractZosFileLocalRSE { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Mvp, addDefaultZosImage = "PRIMARY") - 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/zosFile/local/mvp/ZosFileLocalJava11UbuntuMvpZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/local/mvp/ZosFileLocalJava11UbuntuMvpZosmf.java deleted file mode 100644 index 1c79a71..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/local/mvp/ZosFileLocalJava11UbuntuMvpZosmf.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFile.local.mvp; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosFile.AbstractZosFileLocalZosmf; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","mvp"}) -public class ZosFileLocalJava11UbuntuMvpZosmf extends AbstractZosFileLocalZosmf { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Mvp, addDefaultZosImage = "PRIMARY") - 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/zosFileDataset/AbstractZosFileDatasetLocalRSE.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/AbstractZosFileDatasetLocalRSE.java deleted file mode 100644 index 9b590f8..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/AbstractZosFileDatasetLocalRSE.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFileDataset; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.Test; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.githubissue.GitHubIssue; - -@GitHubIssue( issue = "1961" ) -public abstract class AbstractZosFileDatasetLocalRSE { - - @Test - public void testZosFileIvtTestRSE() throws Exception { - getEcosystem().setCpsProperty("zos.bundle.extra.file.manager", "dev.galasa.zosfile.rseapi.manager"); - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.zos.manager.ivt", - "dev.galasa.zos.manager.ivt.ZosManagerFileDatasetIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - } - - abstract protected IGenericEcosystem getEcosystem(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/AbstractZosFileDatasetLocalZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/AbstractZosFileDatasetLocalZosmf.java deleted file mode 100644 index a719f5d..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/AbstractZosFileDatasetLocalZosmf.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFileDataset; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.Test; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractZosFileDatasetLocalZosmf { - - @Test - public void testZosFileIvtTestZOSMF() throws Exception { - getEcosystem().setCpsProperty("zos.bundle.extra.file.manager", "dev.galasa.zosfile.zosmf.manager"); - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.zos.manager.ivt", - "dev.galasa.zos.manager.ivt.ZosManagerFileDatasetIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - } - - abstract protected IGenericEcosystem getEcosystem(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/local/ZosFileDatasetLocalJava11UbuntuRse.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/local/ZosFileDatasetLocalJava11UbuntuRse.java deleted file mode 100644 index fc7991f..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/local/ZosFileDatasetLocalJava11UbuntuRse.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFileDataset.local; - -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.zosFileDataset.AbstractZosFileDatasetLocalRSE; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu"}) -//@Tags({"codecoverage"}) disabled until RSE stable -public class ZosFileDatasetLocalJava11UbuntuRse extends AbstractZosFileDatasetLocalRSE { - - @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/zosFileDataset/local/ZosFileDatasetLocalJava11UbuntuZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/local/ZosFileDatasetLocalJava11UbuntuZosmf.java deleted file mode 100644 index 6a6383f..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/local/ZosFileDatasetLocalJava11UbuntuZosmf.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFileDataset.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.zosFileDataset.AbstractZosFileDatasetLocalZosmf; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu"}) -@Tags({"codecoverage"}) -public class ZosFileDatasetLocalJava11UbuntuZosmf extends AbstractZosFileDatasetLocalZosmf { - - @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/zosFileDataset/local/isolated/ZosFileDatasetLocalJava11UbuntuIsolatedRse.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/local/isolated/ZosFileDatasetLocalJava11UbuntuIsolatedRse.java deleted file mode 100644 index 8c5f21b..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/local/isolated/ZosFileDatasetLocalJava11UbuntuIsolatedRse.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFileDataset.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosFileDataset.AbstractZosFileDatasetLocalRSE; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","isolated"}) -public class ZosFileDatasetLocalJava11UbuntuIsolatedRse extends AbstractZosFileDatasetLocalRSE { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Full, addDefaultZosImage = "PRIMARY") - 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/zosFileDataset/local/isolated/ZosFileDatasetLocalJava11UbuntuIsolatedZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/local/isolated/ZosFileDatasetLocalJava11UbuntuIsolatedZosmf.java deleted file mode 100644 index ca6ae8d..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/local/isolated/ZosFileDatasetLocalJava11UbuntuIsolatedZosmf.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFileDataset.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosFileDataset.AbstractZosFileDatasetLocalZosmf; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","isolated"}) -public class ZosFileDatasetLocalJava11UbuntuIsolatedZosmf extends AbstractZosFileDatasetLocalZosmf { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Full, addDefaultZosImage = "PRIMARY") - 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/zosFileDataset/local/mvp/ZosFileDatasetLocalJava11UbuntuMvpRse.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/local/mvp/ZosFileDatasetLocalJava11UbuntuMvpRse.java deleted file mode 100644 index c948c96..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/local/mvp/ZosFileDatasetLocalJava11UbuntuMvpRse.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFileDataset.local.mvp; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosFileDataset.AbstractZosFileDatasetLocalRSE; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","mvp"}) -public class ZosFileDatasetLocalJava11UbuntuMvpRse extends AbstractZosFileDatasetLocalRSE { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Mvp, addDefaultZosImage = "PRIMARY") - 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/zosFileDataset/local/mvp/ZosFileDatasetLocalJava11UbuntuMvpZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/local/mvp/ZosFileDatasetLocalJava11UbuntuMvpZosmf.java deleted file mode 100644 index 2ff60f5..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFileDataset/local/mvp/ZosFileDatasetLocalJava11UbuntuMvpZosmf.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosFileDataset.local.mvp; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosFileDataset.AbstractZosFileDatasetLocalZosmf; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","mvp"}) -public class ZosFileDatasetLocalJava11UbuntuMvpZosmf extends AbstractZosFileDatasetLocalZosmf { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Mvp, addDefaultZosImage = "PRIMARY") - 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/zosTso/AbstractZosTsoLocal.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosTso/AbstractZosTsoLocal.java deleted file mode 100644 index b5b4672..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosTso/AbstractZosTsoLocal.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosTso; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.Test; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractZosTsoLocal { - - @Test - public void testZosTSOIvtTest() throws Exception { - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.zos.manager.ivt", - "dev.galasa.zos.manager.ivt.ZosManagerTSOCommandIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - } - - abstract protected IGenericEcosystem getEcosystem(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosTso/local/ZosTsoLocalJava11Ubuntu.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosTso/local/ZosTsoLocalJava11Ubuntu.java deleted file mode 100644 index 54bcba4..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosTso/local/ZosTsoLocalJava11Ubuntu.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosTso.local; - -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.zosTso.AbstractZosTsoLocal; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu"}) -public class ZosTsoLocalJava11Ubuntu extends AbstractZosTsoLocal { - - @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/zosTso/local/isolated/ZosTsoLocalJava11UbuntuIsolated.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosTso/local/isolated/ZosTsoLocalJava11UbuntuIsolated.java deleted file mode 100644 index a7cfd13..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosTso/local/isolated/ZosTsoLocalJava11UbuntuIsolated.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosTso.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosTso.AbstractZosTsoLocal; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","isolated"}) -public class ZosTsoLocalJava11UbuntuIsolated extends AbstractZosTsoLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Full, addDefaultZosImage = "PRIMARY") - 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/zosTso/local/mvp/ZosTsoLocalJava11UbuntuMvp.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosTso/local/mvp/ZosTsoLocalJava11UbuntuMvp.java deleted file mode 100644 index 8bb340f..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosTso/local/mvp/ZosTsoLocalJava11UbuntuMvp.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosTso.local.mvp; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosTso.AbstractZosTsoLocal; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","mvp"}) -public class ZosTsoLocalJava11UbuntuMvp extends AbstractZosTsoLocal { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Mvp, addDefaultZosImage = "PRIMARY") - 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/zosVSAM/AbstractZosVSAMLocalRSE.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/AbstractZosVSAMLocalRSE.java deleted file mode 100644 index 58677ab..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/AbstractZosVSAMLocalRSE.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosVSAM; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.Test; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.githubissue.GitHubIssue; - -@GitHubIssue( issue = "1961" ) -public abstract class AbstractZosVSAMLocalRSE { - - @Test - public void testZosFileIvtTestRSE() throws Exception { - getEcosystem().setCpsProperty("zos.bundle.extra.file.manager", "dev.galasa.zosfile.rseapi.manager"); - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.zos.manager.ivt", - "dev.galasa.zos.manager.ivt.ZosManagerFileVSAMIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - } - - abstract protected IGenericEcosystem getEcosystem(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/AbstractZosVSAMLocalZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/AbstractZosVSAMLocalZosmf.java deleted file mode 100644 index 2265ef6..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/AbstractZosVSAMLocalZosmf.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosVSAM; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.google.gson.JsonObject; - -import dev.galasa.Test; -import dev.galasa.galasaecosystem.IGenericEcosystem; - -public abstract class AbstractZosVSAMLocalZosmf { - - @Test - public void testZosFileIvtTestZOSMF() throws Exception { - getEcosystem().setCpsProperty("zos.bundle.extra.file.manager", "dev.galasa.zosfile.zosmf.manager"); - - String runName = getEcosystem().submitRun(null, - null, - null, - "dev.galasa.zos.manager.ivt", - "dev.galasa.zos.manager.ivt.ZosManagerFileVSAMIVT", - null, - null, - null, - null); - - JsonObject run = getEcosystem().waitForRun(runName); - - String result = run.get("result").getAsString(); - - assertThat(result).describedAs("The test indicates the test passes").isEqualTo("Passed"); - } - - - abstract protected IGenericEcosystem getEcosystem(); - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/local/ZosVSAMLocalJava11UbuntuRse.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/local/ZosVSAMLocalJava11UbuntuRse.java deleted file mode 100644 index df31d29..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/local/ZosVSAMLocalJava11UbuntuRse.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosVSAM.local; - -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.zosVSAM.AbstractZosVSAMLocalRSE; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu"}) -//@Tags({"codecoverage"}) disabled until RSE stable -public class ZosVSAMLocalJava11UbuntuRse extends AbstractZosVSAMLocalRSE { - - @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/zosVSAM/local/ZosVSAMLocalJava11UbuntuZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/local/ZosVSAMLocalJava11UbuntuZosmf.java deleted file mode 100644 index 230120b..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/local/ZosVSAMLocalJava11UbuntuZosmf.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosVSAM.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.zosVSAM.AbstractZosVSAMLocalZosmf; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu"}) -@Tags({"codecoverage"}) -public class ZosVSAMLocalJava11UbuntuZosmf extends AbstractZosVSAMLocalZosmf { - - @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/zosVSAM/local/isolated/ZosVSAMLocalJava11UbuntuIsolatedRse.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/local/isolated/ZosVSAMLocalJava11UbuntuIsolatedRse.java deleted file mode 100644 index 0eec4f7..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/local/isolated/ZosVSAMLocalJava11UbuntuIsolatedRse.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosVSAM.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosVSAM.AbstractZosVSAMLocalRSE; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","isolated"}) -public class ZosVSAMLocalJava11UbuntuIsolatedRse extends AbstractZosVSAMLocalRSE { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Full, addDefaultZosImage = "PRIMARY") - 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/zosVSAM/local/isolated/ZosVSAMLocalJava11UbuntuIsolatedZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/local/isolated/ZosVSAMLocalJava11UbuntuIsolatedZosmf.java deleted file mode 100644 index 9b75c43..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/local/isolated/ZosVSAMLocalJava11UbuntuIsolatedZosmf.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosVSAM.local.isolated; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosVSAM.AbstractZosVSAMLocalZosmf; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","isolated"}) -public class ZosVSAMLocalJava11UbuntuIsolatedZosmf extends AbstractZosVSAMLocalZosmf { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Full, addDefaultZosImage = "PRIMARY") - 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/zosVSAM/local/mvp/ZosVSAMLocalJava11UbuntuMvpRse.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/local/mvp/ZosVSAMLocalJava11UbuntuMvpRse.java deleted file mode 100644 index b6ee5c9..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/local/mvp/ZosVSAMLocalJava11UbuntuMvpRse.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosVSAM.local.mvp; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosVSAM.AbstractZosVSAMLocalRSE; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","mvp"}) -public class ZosVSAMLocalJava11UbuntuMvpRse extends AbstractZosVSAMLocalRSE { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Mvp, addDefaultZosImage = "PRIMARY") - 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/zosVSAM/local/mvp/ZosVSAMLocalJava11UbuntuMvpZosmf.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/local/mvp/ZosVSAMLocalJava11UbuntuMvpZosmf.java deleted file mode 100644 index 3504c1b..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/local/mvp/ZosVSAMLocalJava11UbuntuMvpZosmf.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package dev.galasa.inttests.zosVSAM.local.mvp; - -import dev.galasa.Test; -import dev.galasa.TestAreas; -import dev.galasa.galasaecosystem.IGenericEcosystem; -import dev.galasa.galasaecosystem.ILocalEcosystem; -import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.zosVSAM.AbstractZosVSAMLocalZosmf; -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.zos.IZosImage; -import dev.galasa.zos.ZosImage; - -// @Test -@TestAreas({"zosManager","localecosystem","java11","ubuntu","mvp"}) -public class ZosVSAMLocalJava11UbuntuMvpZosmf extends AbstractZosVSAMLocalZosmf { - - @LocalEcosystem(linuxImageTag = "PRIMARY", isolationInstallation = IsolationInstallation.Mvp, addDefaultZosImage = "PRIMARY") - 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/resources/offlinebuild/AllManagers.txt b/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/offlinebuild/AllManagers.txt deleted file mode 100644 index ff2594d..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/offlinebuild/AllManagers.txt +++ /dev/null @@ -1,37 +0,0 @@ -dev.galasa.artifact.manager -dev.galasa.cicsts.ceci.manager -dev.galasa.cicsts.ceda.manager -dev.galasa.cicsts.cemt.manager -dev.galasa.cicsts.manager -dev.galasa.cicsts.resource.manager -dev.galasa.core.manager -dev.galasa.docker.manager -dev.galasa.elasticlog.manager -dev.galasa.galasaecosystem.manager -dev.galasa.http.manager -dev.galasa.ipnetwork.manager -dev.galasa.java.manager -dev.galasa.java.ubuntu.manager -dev.galasa.java.windows.manager -dev.galasa.jmeter.manager -dev.galasa.kubernetes.manager -dev.galasa.linux.manager -dev.galasa.openstack.manager -dev.galasa.sdv.manager -dev.galasa.selenium.manager -dev.galasa.textscan.manager -dev.galasa.windows.manager -dev.galasa.zos.manager -dev.galasa.zos3270.manager -dev.galasa.zosbatch.rseapi.manager -dev.galasa.zosbatch.zosmf.manager -dev.galasa.zosconsole.oeconsol.manager -dev.galasa.zosconsole.zosmf.manager -dev.galasa.zosfile.rseapi.manager -dev.galasa.zosfile.zosmf.manager -dev.galasa.zosliberty.manager -dev.galasa.zosmf.manager -dev.galasa.zosprogram.manager -dev.galasa.zosrseapi.manager -dev.galasa.zostsocommand.ssh.manager -dev.galasa.zosunixcommand.ssh.manager \ No newline at end of file diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/offlinebuild/HelloWorld.java b/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/offlinebuild/HelloWorld.java deleted file mode 100644 index 611d535..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/offlinebuild/HelloWorld.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright contributors to the Galasa project - * - * SPDX-License-Identifier: EPL-2.0 - */ -package ++PACKAGENAME++; - -public class HelloWorld { - - public static void main(String[] args) { - System.out.println("Hello, World"); - } - -} diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/offlinebuild/MVPManagers.txt b/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/offlinebuild/MVPManagers.txt deleted file mode 100644 index 18a74e9..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/offlinebuild/MVPManagers.txt +++ /dev/null @@ -1,5 +0,0 @@ -dev.galasa.core.manager -dev.galasa.artifact.manager -dev.galasa.http.manager -dev.galasa.docker.manager -dev.galasa.zos3270.manager \ No newline at end of file diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/offlinebuild/exampleBuild.gradle b/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/offlinebuild/exampleBuild.gradle deleted file mode 100644 index bf5e4e7..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/offlinebuild/exampleBuild.gradle +++ /dev/null @@ -1,16 +0,0 @@ -plugins { - id 'java-library' -} - -repositories { - maven { - url="file://++REPO++" - } -} - -dependencies { - implementation 'dev.galasa:dev.galasa:0.+' - implementation 'dev.galasa:dev.galasa.framework:0.+' - -++DEPENDENCIES++ -} \ No newline at end of file diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/offlinebuild/exampleSettings.gradle b/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/offlinebuild/exampleSettings.gradle deleted file mode 100644 index 5a2aec7..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/offlinebuild/exampleSettings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = '++PARENT_FOLDER_NAME++' \ No newline at end of file diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/settings.xml b/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/settings.xml deleted file mode 100644 index fa6a582..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/settings.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - dev.galasa - - - - - galasa - - true - - - - galasa.repo - $galasarepo - - - - - galasa.repo - $galasarepo - - - - - - \ No newline at end of file diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/zosPrograms/APITEST.cbl b/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/zosPrograms/APITEST.cbl deleted file mode 100644 index 71a5ad6..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/zosPrograms/APITEST.cbl +++ /dev/null @@ -1,14 +0,0 @@ - IDENTIFICATION DIVISION. - PROGRAM-ID. APITEST. - ENVIRONMENT DIVISION. - DATA DIVISION. - WORKING-STORAGE SECTION. - 01 BASIC-TEST-RECORD. - 02 FIRST-STRING PIC X(10) VALUE SPACES. - LINKAGE SECTION. - 01 DFHCOMMAREA. - 02 FRSTRING PIC X(10). - PROCEDURE DIVISION. - MOVE DFHCOMMAREA TO BASIC-TEST-RECORD. - MOVE FUNCTION UPPER-CASE(FIRST-STRING) TO FRSTRING. - EXEC CICS RETURN END-EXEC. \ No newline at end of file diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/zosPrograms/CONTTEST.cbl b/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/zosPrograms/CONTTEST.cbl deleted file mode 100644 index 7bb6df7..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/zosPrograms/CONTTEST.cbl +++ /dev/null @@ -1,19 +0,0 @@ - IDENTIFICATION DIVISION. - PROGRAM-ID. CONTTEST. - ENVIRONMENT DIVISION. - DATA DIVISION. - WORKING-STORAGE SECTION. - 01 DATA-ITEMS. - 02 INPUT-DATA PIC X(20). - 02 OUTPUT-DATA PIC X(20). - LINKAGE SECTION. - PROCEDURE DIVISION. - EXEC CICS GET CONTAINER('HOBBIT') - FLENGTH(LENGTH OF INPUT-DATA) - INTO(INPUT-DATA) - END-EXEC. - MOVE FUNCTION UPPER-CASE(INPUT-DATA) TO OUTPUT-DATA - EXEC CICS PUT CONTAINER('HOBBIT') - FROM(OUTPUT-DATA) - END-EXEC. - EXEC CICS RETURN END-EXEC. \ No newline at end of file diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/zosPrograms/PRGABEND.cbl b/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/zosPrograms/PRGABEND.cbl deleted file mode 100644 index fc4c01f..0000000 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/resources/zosPrograms/PRGABEND.cbl +++ /dev/null @@ -1,10 +0,0 @@ - IDENTIFICATION DIVISION. - PROGRAM-ID. PRGABEND. - ENVIRONMENT DIVISION. - CONFIGURATION SECTION. - DATA DIVISION. - WORKING-STORAGE SECTION. - PROCEDURE DIVISION. - EXEC CICS ABEND - END-EXEC. - EXEC CICS RETURN END-EXEC. \ No newline at end of file