From f3e6095d10198702ceea3e480ff597d14dfc008e Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:41:53 +0100 Subject: [PATCH 1/4] Move tests that use the SEM manager into a separate subproject Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- build-locally.sh | 19 ++---- .../build.gradle | 62 +++++++++++++++++ .../dev.galasa.internal.inttests/bnd.bnd | 3 + .../dev.galasa.internal.inttests/build.gradle | 67 +++++++++++++++++++ .../inttests/ceci/AbstractCECILocal.java | 2 +- .../ceci/local/CECILocalJava11Ubuntu.java | 4 +- .../CECILocalJava11UbuntuIsolated.java | 4 +- .../local/mvp/CECILocalJava11UbuntuMvp.java | 5 +- .../inttests/ceda/AbstractCEDALocal.java | 2 +- .../ceda/local/CEDALocalJava11Ubuntu.java | 4 +- .../CEDALocalJava11UbuntuIsolated.java | 4 +- .../inttests/cemt/AbstractCEMTLocal.java | 2 +- .../cemt/local/CEMTLocalJava11Ubuntu.java | 4 +- .../CEMTLocalJava11UbuntuIsolated.java | 4 +- .../inttests/cicsts/AbstractCICSTSLocal.java | 2 +- .../cicsts/local/CICSTSLocalJava11Ubuntu.java | 4 +- .../CICSTSLocalJava11UbuntuIsolated.java | 4 +- .../inttests/sdv/AbstractSDVLocal.java | 2 +- .../sdv/local/SDVLocalJava11Ubuntu.java | 4 +- .../SDVLocalJava11UbuntuIsolated.java | 4 +- .../main/resources/zosPrograms/APITEST.cbl | 14 ++++ .../main/resources/zosPrograms/CONTTEST.cbl | 19 ++++++ .../main/resources/zosPrograms/PRGABEND.cbl | 10 +++ .../gradle.properties | 3 + .../settings.gradle | 16 +++++ galasa-inttests-parent/build.gradle | 11 ++- .../dev.galasa.inttests.obr/pom.xml | 4 +- .../dev.galasa.inttests/build.gradle | 6 +- galasa-inttests-parent/gradle.properties | 2 +- 29 files changed, 236 insertions(+), 55 deletions(-) create mode 100644 galasa-internal-inttests-parent/dev.galasa.internal.inttests.obr/build.gradle create mode 100644 galasa-internal-inttests-parent/dev.galasa.internal.inttests/bnd.bnd create mode 100644 galasa-internal-inttests-parent/dev.galasa.internal.inttests/build.gradle rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/ceci/AbstractCECILocal.java (99%) rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/ceci/local/CECILocalJava11Ubuntu.java (92%) rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java (92%) rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java (92%) rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/ceda/AbstractCEDALocal.java (98%) rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/ceda/local/CEDALocalJava11Ubuntu.java (92%) rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java (92%) rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/cemt/AbstractCEMTLocal.java (98%) rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/cemt/local/CEMTLocalJava11Ubuntu.java (92%) rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java (92%) rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/cicsts/AbstractCICSTSLocal.java (97%) rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java (92%) rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java (92%) rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/sdv/AbstractSDVLocal.java (98%) rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/sdv/local/SDVLocalJava11Ubuntu.java (92%) rename {galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa => galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal}/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java (92%) create mode 100644 galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/resources/zosPrograms/APITEST.cbl create mode 100644 galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/resources/zosPrograms/CONTTEST.cbl create mode 100644 galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/resources/zosPrograms/PRGABEND.cbl create mode 100644 galasa-internal-inttests-parent/gradle.properties create mode 100644 galasa-internal-inttests-parent/settings.gradle diff --git a/build-locally.sh b/build-locally.sh index 08212be9..5c19f70e 100755 --- a/build-locally.sh +++ b/build-locally.sh @@ -127,7 +127,7 @@ function gradle_build { -Dorg.gradle.java.home=${JAVA_HOME} \ -PsourceMaven=https://development.galasa.dev/main/maven-repo/obr ${OPTIONAL_DEBUG_FLAG} \ -PcentralMaven=https://repo.maven.apache.org/maven2/ \ - publish publishToMavenLocal \ + build publishToMavenLocal \ " info "Using this command: $cmd" @@ -136,29 +136,22 @@ function gradle_build { success "Built OK" } -function publish_artifacts { - h2 "Publishing using Maven..." +function build_obr { + h2 "Building OBR using Maven..." cd ${BASEDIR}/galasa-inttests-parent/dev.galasa.inttests.obr - context=inttests/galasa-inttests-parent/dev.galasa.inttests.obr - bootstrap=https://galasa-ecosystem1.galasa.dev/api/bootstrap - cmd="mvn \ -Dgalasa.source.repo=https://development.galasa.dev/main/maven-repo/obr \ -Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \ - -Dgalasa.release.repo=file://$BASEDIR/temp \ - -Dgalasa.bootstrap=${bootstrap} \ - -Dgalasa.skip.deploytestcatalog=true \ - -Dgalasa.skip.bundletestcatalog=false \ - deploy dev.galasa:galasa-maven-plugin:deploytestcat \ + install " info "Using this command: $cmd" $cmd 2>&1 >> ${log_file} rc=$? ; if [[ "${rc}" != "0" ]]; then error "Failed to build ${project} log is at ${log_file}" ; exit 1 ; fi - success "Published to '${bootstrap}' OK" + success "Built ${project} OBR OK" } mkdir -p $BASEDIR/temp gradle_build -publish_artifacts \ No newline at end of file +build_obr \ No newline at end of file diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests.obr/build.gradle b/galasa-internal-inttests-parent/dev.galasa.internal.inttests.obr/build.gradle new file mode 100644 index 00000000..0568abdd --- /dev/null +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests.obr/build.gradle @@ -0,0 +1,62 @@ +// This section tells gradle which gradle plugins to use to build this project. +plugins { + id 'base' + id 'maven-publish' + id 'dev.galasa.obr' version '0.36.0' + id 'dev.galasa.testcatalog' version '0.36.0' +} + +// Set the variables which will control what the built OSGi bundle will be called +// and the name it will be published under in the maven repository. +group = 'dev.galasa' +version = '0.38.0' + +// What are the dependencies of the obr ? +dependencies { + bundle project(':dev.galasa.internal.inttests') +} + +def testcatalog = file('build/testcatalog.json') +def obrFile = file('build/galasa.obr') + + +tasks.withType(PublishToMavenLocal) { task -> + task.dependsOn genobr + task.dependsOn mergetestcat +} + +// Tell gradle to publish the built OBR as a maven artifact on the +// local maven repository. +publishing { + publications { + maven(MavenPublication) { + artifact obrFile + artifact (testcatalog) { + classifier "testcatalog" + extension "json" + } + } + } + repositories { + maven { + url "$targetMaven" + + if ("$targetMaven".startsWith('http')) { + credentials { + username System.getenv('GITHUB_ACTOR') + password System.getenv('GITHUB_TOKEN') + } + } + } + } +} + +// If we are deploying a test catalog using the galasa plugin, +// directly to the ecosystem, then we can get the properties +// we need from the system properties, passed on the command line using +// -DGALASA_STREAM=xxx -DGALASA_BOOTSTRAP=xxx -DGALASA_TOKEN=xxx +deployTestCatalog { + bootstrap = System.getProperty("GALASA_BOOTSTRAP") + stream = System.getProperty("GALASA_STREAM") + token = System.getProperty("GALASA_TOKEN"); +} \ No newline at end of file diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/bnd.bnd b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/bnd.bnd new file mode 100644 index 00000000..06889812 --- /dev/null +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/bnd.bnd @@ -0,0 +1,3 @@ +Bundle-Version: 0.0.1-SNAPSHOT +Bundle-Name: dev.galasa.internal.inttests +Import-Package: * diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/build.gradle b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/build.gradle new file mode 100644 index 00000000..79996423 --- /dev/null +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/build.gradle @@ -0,0 +1,67 @@ +// This section tells gradle which gradle plugins to use to build this project. +plugins { + id 'java' + id 'maven-publish' + id 'dev.galasa.tests' version '0.36.0' + id 'biz.aQute.bnd.builder' version '6.4.0' +} + +// This section tells gradle where it should look for any dependencies +repositories { + mavenLocal() + mavenCentral() + maven { + url "$sourceMaven" + } + maven { + url "$internalMaven" + } + +} + +// Set the variables which will control what the built OSGi bundle will be called +// and the name it will be published under in the maven repository. +group = 'dev.galasa' +version = '0.38.0' + +// What are the dependencies of the test code ? +// When more managers and dependencies are added, this list will need to grow. +dependencies { + implementation platform('dev.galasa:galasa-bom:0.38.0') + + implementation 'dev.galasa:dev.galasa' + implementation 'dev.galasa:dev.galasa.framework' + implementation 'dev.galasa:dev.galasa.core.manager' + implementation 'commons-logging:commons-logging' + implementation 'org.assertj:assertj-core' + + implementation 'dev.galasa:dev.galasa.galasaecosystem.manager' + implementation 'dev.galasa:dev.galasa.sem.manager' + implementation 'dev.galasa:dev.galasa.cicsts.manager' + implementation 'dev.galasa:dev.galasa.sdv.manager' + implementation 'dev.galasa:dev.galasa.zosprogram.manager' + + implementation 'com.google.code.gson:gson:2.10.1' +} + +// Tell gradle to publish the built OSGi bundles as maven artifacts on the +// local maven repository. +publishing { + publications { + maven(MavenPublication) { + from components.java + } + } + repositories { + maven { + url "$targetMaven" + + if ("$targetMaven".startsWith('http')) { + credentials { + username System.getenv('GITHUB_ACTOR') + password System.getenv('GITHUB_TOKEN') + } + } + } + } +} \ No newline at end of file diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/AbstractCECILocal.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/AbstractCECILocal.java similarity index 99% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/AbstractCECILocal.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/AbstractCECILocal.java index a6b3d643..5cf92ec7 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/AbstractCECILocal.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/AbstractCECILocal.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.ceci; +package dev.galasa.internal.inttests.ceci; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/CECILocalJava11Ubuntu.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/CECILocalJava11Ubuntu.java similarity index 92% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/CECILocalJava11Ubuntu.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/CECILocalJava11Ubuntu.java index 3207fa02..1eb24434 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/CECILocalJava11Ubuntu.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/CECILocalJava11Ubuntu.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.ceci.local; +package dev.galasa.internal.inttests.ceci.local; import dev.galasa.Tags; import dev.galasa.Test; @@ -11,7 +11,7 @@ import dev.galasa.galasaecosystem.IGenericEcosystem; import dev.galasa.galasaecosystem.ILocalEcosystem; import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.ceci.AbstractCECILocal; +import dev.galasa.internal.inttests.ceci.AbstractCECILocal; import dev.galasa.java.JavaVersion; import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; import dev.galasa.java.ubuntu.JavaUbuntuInstallation; diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java similarity index 92% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java index 5d2d44ca..3c231a26 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.ceci.local.isolated; +package dev.galasa.internal.inttests.ceci.local.isolated; import dev.galasa.Test; import dev.galasa.TestAreas; @@ -11,7 +11,7 @@ import dev.galasa.galasaecosystem.ILocalEcosystem; import dev.galasa.galasaecosystem.LocalEcosystem; import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.inttests.ceci.AbstractCECILocal; +import dev.galasa.internal.inttests.ceci.AbstractCECILocal; import dev.galasa.java.JavaVersion; import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; import dev.galasa.java.ubuntu.JavaUbuntuInstallation; diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java similarity index 92% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java index 58f5660e..b0ec0c70 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java @@ -3,15 +3,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.ceci.local.mvp; +package dev.galasa.internal.inttests.ceci.local.mvp; -import dev.galasa.Test; import dev.galasa.TestAreas; import dev.galasa.galasaecosystem.IGenericEcosystem; import dev.galasa.galasaecosystem.ILocalEcosystem; import dev.galasa.galasaecosystem.LocalEcosystem; import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.inttests.ceci.AbstractCECILocal; +import dev.galasa.internal.inttests.ceci.AbstractCECILocal; import dev.galasa.java.JavaVersion; import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; import dev.galasa.java.ubuntu.JavaUbuntuInstallation; diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/AbstractCEDALocal.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/AbstractCEDALocal.java similarity index 98% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/AbstractCEDALocal.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/AbstractCEDALocal.java index c3c36b67..e0b152c0 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/AbstractCEDALocal.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/AbstractCEDALocal.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.ceda; +package dev.galasa.internal.inttests.ceda; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/local/CEDALocalJava11Ubuntu.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/CEDALocalJava11Ubuntu.java similarity index 92% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/local/CEDALocalJava11Ubuntu.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/CEDALocalJava11Ubuntu.java index 2df02587..87c5f7aa 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/local/CEDALocalJava11Ubuntu.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/CEDALocalJava11Ubuntu.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.ceda.local; +package dev.galasa.internal.inttests.ceda.local; import dev.galasa.Tags; import dev.galasa.Test; @@ -11,7 +11,7 @@ import dev.galasa.galasaecosystem.IGenericEcosystem; import dev.galasa.galasaecosystem.ILocalEcosystem; import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.ceda.AbstractCEDALocal; +import dev.galasa.internal.inttests.ceda.AbstractCEDALocal; import dev.galasa.java.JavaVersion; import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; import dev.galasa.java.ubuntu.JavaUbuntuInstallation; diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java similarity index 92% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java index 3afdfa2e..512666ce 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.ceda.local.isolated; +package dev.galasa.internal.inttests.ceda.local.isolated; import dev.galasa.Test; import dev.galasa.TestAreas; @@ -11,7 +11,7 @@ import dev.galasa.galasaecosystem.ILocalEcosystem; import dev.galasa.galasaecosystem.LocalEcosystem; import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.inttests.ceda.AbstractCEDALocal; +import dev.galasa.internal.inttests.ceda.AbstractCEDALocal; import dev.galasa.java.JavaVersion; import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; import dev.galasa.java.ubuntu.JavaUbuntuInstallation; diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/AbstractCEMTLocal.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/AbstractCEMTLocal.java similarity index 98% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/AbstractCEMTLocal.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/AbstractCEMTLocal.java index 84ce17ab..2a13048f 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/AbstractCEMTLocal.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/AbstractCEMTLocal.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.cemt; +package dev.galasa.internal.inttests.cemt; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/local/CEMTLocalJava11Ubuntu.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/CEMTLocalJava11Ubuntu.java similarity index 92% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/local/CEMTLocalJava11Ubuntu.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/CEMTLocalJava11Ubuntu.java index a7e83c0b..e8fca53f 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/local/CEMTLocalJava11Ubuntu.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/CEMTLocalJava11Ubuntu.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.cemt.local; +package dev.galasa.internal.inttests.cemt.local; import dev.galasa.Tags; import dev.galasa.Test; @@ -11,7 +11,7 @@ import dev.galasa.galasaecosystem.IGenericEcosystem; import dev.galasa.galasaecosystem.ILocalEcosystem; import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.cemt.AbstractCEMTLocal; +import dev.galasa.internal.inttests.cemt.AbstractCEMTLocal; import dev.galasa.java.JavaVersion; import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; import dev.galasa.java.ubuntu.JavaUbuntuInstallation; diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java similarity index 92% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java index 26ad556a..02e57820 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.cemt.local.isolated; +package dev.galasa.internal.inttests.cemt.local.isolated; import dev.galasa.Test; import dev.galasa.TestAreas; @@ -11,7 +11,7 @@ import dev.galasa.galasaecosystem.ILocalEcosystem; import dev.galasa.galasaecosystem.LocalEcosystem; import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.inttests.cemt.AbstractCEMTLocal; +import dev.galasa.internal.inttests.cemt.AbstractCEMTLocal; import dev.galasa.java.JavaVersion; import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; import dev.galasa.java.ubuntu.JavaUbuntuInstallation; diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/AbstractCICSTSLocal.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/AbstractCICSTSLocal.java similarity index 97% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/AbstractCICSTSLocal.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/AbstractCICSTSLocal.java index e3e0efac..5ab60025 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/AbstractCICSTSLocal.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/AbstractCICSTSLocal.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.cicsts; +package dev.galasa.internal.inttests.cicsts; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java similarity index 92% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java index bf28c22c..fcc2a197 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.cicsts.local; +package dev.galasa.internal.inttests.cicsts.local; import dev.galasa.Tags; import dev.galasa.Test; @@ -11,7 +11,7 @@ import dev.galasa.galasaecosystem.IGenericEcosystem; import dev.galasa.galasaecosystem.ILocalEcosystem; import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.cicsts.AbstractCICSTSLocal; +import dev.galasa.internal.inttests.cicsts.AbstractCICSTSLocal; import dev.galasa.java.JavaVersion; import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; import dev.galasa.java.ubuntu.JavaUbuntuInstallation; diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java similarity index 92% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java index 7dc16976..5af79122 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.cicsts.local.isolated; +package dev.galasa.internal.inttests.cicsts.local.isolated; import dev.galasa.Test; import dev.galasa.TestAreas; @@ -11,7 +11,7 @@ import dev.galasa.galasaecosystem.ILocalEcosystem; import dev.galasa.galasaecosystem.LocalEcosystem; import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.inttests.cicsts.AbstractCICSTSLocal; +import dev.galasa.internal.inttests.cicsts.AbstractCICSTSLocal; import dev.galasa.java.JavaVersion; import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; import dev.galasa.java.ubuntu.JavaUbuntuInstallation; diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/AbstractSDVLocal.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/AbstractSDVLocal.java similarity index 98% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/AbstractSDVLocal.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/AbstractSDVLocal.java index 7a131243..7c6643cb 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/AbstractSDVLocal.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/AbstractSDVLocal.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.sdv; +package dev.galasa.internal.inttests.sdv; import static org.assertj.core.api.Assertions.assertThat; diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/local/SDVLocalJava11Ubuntu.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/SDVLocalJava11Ubuntu.java similarity index 92% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/local/SDVLocalJava11Ubuntu.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/SDVLocalJava11Ubuntu.java index 85c916f5..149a5648 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/local/SDVLocalJava11Ubuntu.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/SDVLocalJava11Ubuntu.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.sdv.local; +package dev.galasa.internal.inttests.sdv.local; import dev.galasa.Tags; import dev.galasa.Test; @@ -11,7 +11,7 @@ import dev.galasa.galasaecosystem.IGenericEcosystem; import dev.galasa.galasaecosystem.ILocalEcosystem; import dev.galasa.galasaecosystem.LocalEcosystem; -import dev.galasa.inttests.sdv.AbstractSDVLocal; +import dev.galasa.internal.inttests.sdv.AbstractSDVLocal; import dev.galasa.java.JavaVersion; import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; import dev.galasa.java.ubuntu.JavaUbuntuInstallation; diff --git a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java similarity index 92% rename from galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java rename to galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java index 57554c54..f7303435 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/src/main/java/dev/galasa/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package dev.galasa.inttests.sdv.local.isolated; +package dev.galasa.internal.inttests.sdv.local.isolated; import dev.galasa.Test; import dev.galasa.TestAreas; @@ -11,7 +11,7 @@ import dev.galasa.galasaecosystem.ILocalEcosystem; import dev.galasa.galasaecosystem.LocalEcosystem; import dev.galasa.galasaecosystem.IsolationInstallation; -import dev.galasa.inttests.sdv.AbstractSDVLocal; +import dev.galasa.internal.inttests.sdv.AbstractSDVLocal; import dev.galasa.java.JavaVersion; import dev.galasa.java.ubuntu.IJavaUbuntuInstallation; import dev.galasa.java.ubuntu.JavaUbuntuInstallation; diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/resources/zosPrograms/APITEST.cbl b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/resources/zosPrograms/APITEST.cbl new file mode 100644 index 00000000..71a5ad61 --- /dev/null +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/resources/zosPrograms/APITEST.cbl @@ -0,0 +1,14 @@ + 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-internal-inttests-parent/dev.galasa.internal.inttests/src/main/resources/zosPrograms/CONTTEST.cbl b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/resources/zosPrograms/CONTTEST.cbl new file mode 100644 index 00000000..7bb6df7c --- /dev/null +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/resources/zosPrograms/CONTTEST.cbl @@ -0,0 +1,19 @@ + 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-internal-inttests-parent/dev.galasa.internal.inttests/src/main/resources/zosPrograms/PRGABEND.cbl b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/resources/zosPrograms/PRGABEND.cbl new file mode 100644 index 00000000..fc4c01fe --- /dev/null +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/resources/zosPrograms/PRGABEND.cbl @@ -0,0 +1,10 @@ + 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 diff --git a/galasa-internal-inttests-parent/gradle.properties b/galasa-internal-inttests-parent/gradle.properties new file mode 100644 index 00000000..f046c056 --- /dev/null +++ b/galasa-internal-inttests-parent/gradle.properties @@ -0,0 +1,3 @@ +sourceMaven=https://development.galasa.dev/main/maven-repo/obr +internalMaven=https://repo.maven.apache.org/maven2/ +targetMaven=https://repo.maven.apache.org/maven2/ \ No newline at end of file diff --git a/galasa-internal-inttests-parent/settings.gradle b/galasa-internal-inttests-parent/settings.gradle new file mode 100644 index 00000000..a8e648f5 --- /dev/null +++ b/galasa-internal-inttests-parent/settings.gradle @@ -0,0 +1,16 @@ +// Tell gradle where it should look to find the plugins and dependencies it needs to build. +pluginManagement { + repositories { + mavenLocal() + maven { + url "$sourceMaven" + } + + gradlePluginPortal() + mavenCentral() + } +} + +// Tell gradle to build the sub-projects in child folders +include 'dev.galasa.internal.inttests' +include 'dev.galasa.internal.inttests.obr' diff --git a/galasa-inttests-parent/build.gradle b/galasa-inttests-parent/build.gradle index 4e728714..43ddb92b 100644 --- a/galasa-inttests-parent/build.gradle +++ b/galasa-inttests-parent/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'dev.galasa.githash' version '0.33.0' apply false - id 'dev.galasa.testcatalog' version '0.33.0' apply false - id 'dev.galasa.tests' version '0.33.0' apply false + id 'dev.galasa.githash' version '0.36.0' apply false + id 'dev.galasa.testcatalog' version '0.36.0' apply false + id 'dev.galasa.tests' version '0.36.0' apply false } subprojects { @@ -86,7 +86,7 @@ subprojects { // } dependencies { - implementation platform('dev.galasa:galasa-bom:0.36.0') + implementation platform('dev.galasa:galasa-bom:0.38.0') compileOnly 'dev.galasa:dev.galasa' compileOnly 'dev.galasa:dev.galasa.framework' @@ -104,9 +104,6 @@ subprojects { compileOnly 'dev.galasa:dev.galasa.java.manager' compileOnly 'dev.galasa:dev.galasa.java.ubuntu.manager' compileOnly 'dev.galasa:dev.galasa.java.windows.manager' - compileOnly 'dev.galasa:dev.galasa.sem.manager' - compileOnly 'dev.galasa:dev.galasa.cicsts.manager' - compileOnly 'dev.galasa:dev.galasa.sdv.manager' compileOnly 'dev.galasa:dev.galasa.zosprogram.manager' compileOnly 'dev.galasa:dev.galasa.githubissue.manager' compileOnly 'commons-logging:commons-logging:1.2' diff --git a/galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml b/galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml index bbd99f06..34c2daa2 100644 --- a/galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml +++ b/galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml @@ -5,7 +5,7 @@ dev.galasa dev.galasa.inttests.obr - 0.36.0 + 0.38.0 galasa-obr @@ -25,7 +25,7 @@ dev.galasa dev.galasa.inttests - 0.36.0 + 0.38.0 compile diff --git a/galasa-inttests-parent/dev.galasa.inttests/build.gradle b/galasa-inttests-parent/dev.galasa.inttests/build.gradle index 5b3ce89a..38d2bb26 100644 --- a/galasa-inttests-parent/dev.galasa.inttests/build.gradle +++ b/galasa-inttests-parent/dev.galasa.inttests/build.gradle @@ -5,11 +5,9 @@ plugins { description = 'Galasa Integration Tests' -version = '0.36.0' +version = '0.38.0' dependencies { - implementation platform('dev.galasa:galasa-bom:0.36.0') - - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.10.1' implementation 'commons-io:commons-io:2.9.0' } diff --git a/galasa-inttests-parent/gradle.properties b/galasa-inttests-parent/gradle.properties index fd5a72b3..060f5648 100644 --- a/galasa-inttests-parent/gradle.properties +++ b/galasa-inttests-parent/gradle.properties @@ -1,6 +1,6 @@ galasaGroup=dev.galasa galasaName=galasa -galasaVersion=0.36.0 +galasaVersion=0.38.0 galasaSourceCompatibility=11 galasaTargetCompatibility=11 From cca72725be32fd3b2022a8bb723b770532a30319 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Fri, 20 Sep 2024 16:28:55 +0100 Subject: [PATCH 2/4] Replace OS SEM manager dependency with internal provisioning manager Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../dev.galasa.internal.inttests/build.gradle | 2 +- .../internal/inttests/ceci/local/CECILocalJava11Ubuntu.java | 5 +++-- .../ceci/local/isolated/CECILocalJava11UbuntuIsolated.java | 5 +++-- .../inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java | 5 +++-- .../internal/inttests/ceda/local/CEDALocalJava11Ubuntu.java | 5 +++-- .../ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java | 5 +++-- .../internal/inttests/cemt/local/CEMTLocalJava11Ubuntu.java | 5 +++-- .../cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java | 5 +++-- .../inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java | 5 +++-- .../local/isolated/CICSTSLocalJava11UbuntuIsolated.java | 5 +++-- .../internal/inttests/sdv/local/SDVLocalJava11Ubuntu.java | 5 +++-- .../sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java | 5 +++-- 12 files changed, 34 insertions(+), 23 deletions(-) diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/build.gradle b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/build.gradle index 79996423..4d345b44 100644 --- a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/build.gradle +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/build.gradle @@ -36,11 +36,11 @@ dependencies { implementation 'org.assertj:assertj-core' implementation 'dev.galasa:dev.galasa.galasaecosystem.manager' - implementation 'dev.galasa:dev.galasa.sem.manager' implementation 'dev.galasa:dev.galasa.cicsts.manager' implementation 'dev.galasa:dev.galasa.sdv.manager' implementation 'dev.galasa:dev.galasa.zosprogram.manager' + implementation 'com.ibm.cics.managers:com.ibm.cics.provisioning.manager:0.0.4' implementation 'com.google.code.gson:gson:2.10.1' } diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/CECILocalJava11Ubuntu.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/CECILocalJava11Ubuntu.java index 1eb24434..7073415e 100644 --- a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/CECILocalJava11Ubuntu.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/CECILocalJava11Ubuntu.java @@ -5,6 +5,8 @@ */ package dev.galasa.internal.inttests.ceci.local; +import com.ibm.cics.provisioning.annotations.Topology; + import dev.galasa.Tags; import dev.galasa.Test; import dev.galasa.TestAreas; @@ -18,11 +20,10 @@ import dev.galasa.linux.ILinuxImage; import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; import dev.galasa.zos.IZosImage; import dev.galasa.zos.ZosImage; -@SemTopology +@Topology @Test @TestAreas({"ceciManager","localecosystem","java11","ubuntu"}) @Tags({"codecoverage"}) diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java index 3c231a26..21c99399 100644 --- a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/isolated/CECILocalJava11UbuntuIsolated.java @@ -5,6 +5,8 @@ */ package dev.galasa.internal.inttests.ceci.local.isolated; +import com.ibm.cics.provisioning.annotations.Topology; + import dev.galasa.Test; import dev.galasa.TestAreas; import dev.galasa.galasaecosystem.IGenericEcosystem; @@ -18,11 +20,10 @@ import dev.galasa.linux.ILinuxImage; import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; import dev.galasa.zos.IZosImage; import dev.galasa.zos.ZosImage; -@SemTopology +@Topology @Test @TestAreas({"ceciManager","localecosystem","java11","ubuntu","isolated"}) public class CECILocalJava11UbuntuIsolated extends AbstractCECILocal { diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java index b0ec0c70..4e232af2 100644 --- a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceci/local/mvp/CECILocalJava11UbuntuMvp.java @@ -5,6 +5,8 @@ */ package dev.galasa.internal.inttests.ceci.local.mvp; +import com.ibm.cics.provisioning.annotations.Topology; + import dev.galasa.TestAreas; import dev.galasa.galasaecosystem.IGenericEcosystem; import dev.galasa.galasaecosystem.ILocalEcosystem; @@ -17,11 +19,10 @@ import dev.galasa.linux.ILinuxImage; import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; import dev.galasa.zos.IZosImage; import dev.galasa.zos.ZosImage; -@SemTopology +@Topology // @Test @TestAreas({"ceciManager","localecosystem","java11","ubuntu","mvp"}) public class CECILocalJava11UbuntuMvp extends AbstractCECILocal { diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/CEDALocalJava11Ubuntu.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/CEDALocalJava11Ubuntu.java index 87c5f7aa..6985806c 100644 --- a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/CEDALocalJava11Ubuntu.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/CEDALocalJava11Ubuntu.java @@ -5,6 +5,8 @@ */ package dev.galasa.internal.inttests.ceda.local; +import com.ibm.cics.provisioning.annotations.Topology; + import dev.galasa.Tags; import dev.galasa.Test; import dev.galasa.TestAreas; @@ -18,11 +20,10 @@ import dev.galasa.linux.ILinuxImage; import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; import dev.galasa.zos.IZosImage; import dev.galasa.zos.ZosImage; -@SemTopology +@Topology @Test @TestAreas({"cedaManager","localecosystem","java11","ubuntu"}) @Tags({"codecoverage"}) diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java index 512666ce..4050bb18 100644 --- a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/ceda/local/isolated/CEDALocalJava11UbuntuIsolated.java @@ -5,6 +5,8 @@ */ package dev.galasa.internal.inttests.ceda.local.isolated; +import com.ibm.cics.provisioning.annotations.Topology; + import dev.galasa.Test; import dev.galasa.TestAreas; import dev.galasa.galasaecosystem.IGenericEcosystem; @@ -18,11 +20,10 @@ import dev.galasa.linux.ILinuxImage; import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; import dev.galasa.zos.IZosImage; import dev.galasa.zos.ZosImage; -@SemTopology +@Topology @Test @TestAreas({"cedaManager","localecosystem","java11","ubuntu","isolated"}) public class CEDALocalJava11UbuntuIsolated extends AbstractCEDALocal { diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/CEMTLocalJava11Ubuntu.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/CEMTLocalJava11Ubuntu.java index e8fca53f..ea81ce95 100644 --- a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/CEMTLocalJava11Ubuntu.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/CEMTLocalJava11Ubuntu.java @@ -5,6 +5,8 @@ */ package dev.galasa.internal.inttests.cemt.local; +import com.ibm.cics.provisioning.annotations.Topology; + import dev.galasa.Tags; import dev.galasa.Test; import dev.galasa.TestAreas; @@ -18,11 +20,10 @@ import dev.galasa.linux.ILinuxImage; import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; import dev.galasa.zos.IZosImage; import dev.galasa.zos.ZosImage; -@SemTopology +@Topology @Test @TestAreas({"cemtManager","localecosystem","java11","ubuntu"}) @Tags({"codecoverage"}) diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java index 02e57820..d0b61f35 100644 --- a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cemt/local/isolated/CEMTLocalJava11UbuntuIsolated.java @@ -5,6 +5,8 @@ */ package dev.galasa.internal.inttests.cemt.local.isolated; +import com.ibm.cics.provisioning.annotations.Topology; + import dev.galasa.Test; import dev.galasa.TestAreas; import dev.galasa.galasaecosystem.IGenericEcosystem; @@ -18,11 +20,10 @@ import dev.galasa.linux.ILinuxImage; import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; import dev.galasa.zos.IZosImage; import dev.galasa.zos.ZosImage; -@SemTopology +@Topology @Test @TestAreas({"cemtManager","localecosystem","java11","ubuntu","isolated"}) public class CEMTLocalJava11UbuntuIsolated extends AbstractCEMTLocal { diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java index fcc2a197..572b226d 100644 --- a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/local/CICSTSLocalJava11Ubuntu.java @@ -5,6 +5,8 @@ */ package dev.galasa.internal.inttests.cicsts.local; +import com.ibm.cics.provisioning.annotations.Topology; + import dev.galasa.Tags; import dev.galasa.Test; import dev.galasa.TestAreas; @@ -18,11 +20,10 @@ import dev.galasa.linux.ILinuxImage; import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; import dev.galasa.zos.IZosImage; import dev.galasa.zos.ZosImage; -@SemTopology +@Topology @Test @TestAreas({"cicstsManager","localecosystem","java11","ubuntu"}) @Tags({"codecoverage"}) diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java index 5af79122..5adeb0ea 100644 --- a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/cicsts/local/isolated/CICSTSLocalJava11UbuntuIsolated.java @@ -5,6 +5,8 @@ */ package dev.galasa.internal.inttests.cicsts.local.isolated; +import com.ibm.cics.provisioning.annotations.Topology; + import dev.galasa.Test; import dev.galasa.TestAreas; import dev.galasa.galasaecosystem.IGenericEcosystem; @@ -18,11 +20,10 @@ import dev.galasa.linux.ILinuxImage; import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; import dev.galasa.zos.IZosImage; import dev.galasa.zos.ZosImage; -@SemTopology +@Topology @Test @TestAreas({"cicstsManager","localecosystem","java11","ubuntu","isolated"}) public class CICSTSLocalJava11UbuntuIsolated extends AbstractCICSTSLocal { diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/SDVLocalJava11Ubuntu.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/SDVLocalJava11Ubuntu.java index 149a5648..4637796e 100644 --- a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/SDVLocalJava11Ubuntu.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/SDVLocalJava11Ubuntu.java @@ -5,6 +5,8 @@ */ package dev.galasa.internal.inttests.sdv.local; +import com.ibm.cics.provisioning.annotations.Topology; + import dev.galasa.Tags; import dev.galasa.Test; import dev.galasa.TestAreas; @@ -18,11 +20,10 @@ import dev.galasa.linux.ILinuxImage; import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; import dev.galasa.zos.IZosImage; import dev.galasa.zos.ZosImage; -@SemTopology +@Topology @Test @TestAreas({"sdvManager","localecosystem","java11","ubuntu"}) @Tags({"codecoverage"}) diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java index f7303435..614845e9 100644 --- a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/src/main/java/dev/galasa/internal/inttests/sdv/local/isolated/SDVLocalJava11UbuntuIsolated.java @@ -5,6 +5,8 @@ */ package dev.galasa.internal.inttests.sdv.local.isolated; +import com.ibm.cics.provisioning.annotations.Topology; + import dev.galasa.Test; import dev.galasa.TestAreas; import dev.galasa.galasaecosystem.IGenericEcosystem; @@ -18,11 +20,10 @@ import dev.galasa.linux.ILinuxImage; import dev.galasa.linux.LinuxImage; import dev.galasa.linux.OperatingSystem; -import dev.galasa.sem.SemTopology; import dev.galasa.zos.IZosImage; import dev.galasa.zos.ZosImage; -@SemTopology +@Topology @Test @TestAreas({"sdvManager","localecosystem","java11","ubuntu","isolated"}) public class SDVLocalJava11UbuntuIsolated extends AbstractSDVLocal { From bb1274ef171d64d182e99ac6b27ce4976623cd33 Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:36:28 +0100 Subject: [PATCH 3/4] Fix maven publish build failure Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- .../dev.galasa.internal.inttests.obr/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests.obr/build.gradle b/galasa-internal-inttests-parent/dev.galasa.internal.inttests.obr/build.gradle index 0568abdd..5d975be8 100644 --- a/galasa-internal-inttests-parent/dev.galasa.internal.inttests.obr/build.gradle +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests.obr/build.gradle @@ -19,8 +19,7 @@ dependencies { def testcatalog = file('build/testcatalog.json') def obrFile = file('build/galasa.obr') - -tasks.withType(PublishToMavenLocal) { task -> +tasks.withType(AbstractPublishToMaven) { task -> task.dependsOn genobr task.dependsOn mergetestcat } From 8db918687e784100ffa749fb32dea50eb592a9ba Mon Sep 17 00:00:00 2001 From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> Date: Mon, 23 Sep 2024 11:20:05 +0100 Subject: [PATCH 4/4] Add README to internal inttests subproject Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com> --- galasa-internal-inttests-parent/README.md | 5 +++++ .../dev.galasa.internal.inttests/bnd.bnd | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 galasa-internal-inttests-parent/README.md diff --git a/galasa-internal-inttests-parent/README.md b/galasa-internal-inttests-parent/README.md new file mode 100644 index 00000000..f983fcb6 --- /dev/null +++ b/galasa-internal-inttests-parent/README.md @@ -0,0 +1,5 @@ +# Galasa Internal Integration Tests + +The integration tests in this subproject depend on an Galasa provisioning manager hosted within IBM to exercise certain managers, including the CICS TS and SDV managers. + +As a result, these tests can only be run internally until an open source equivalent of the provisioning manager is created. diff --git a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/bnd.bnd b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/bnd.bnd index 06889812..fecedc98 100644 --- a/galasa-internal-inttests-parent/dev.galasa.internal.inttests/bnd.bnd +++ b/galasa-internal-inttests-parent/dev.galasa.internal.inttests/bnd.bnd @@ -1,3 +1,2 @@ -Bundle-Version: 0.0.1-SNAPSHOT Bundle-Name: dev.galasa.internal.inttests Import-Package: *