Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compilation test #170

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Compilation test #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
223589a
annotated compilation test with Github issue
AaronJhaj Sep 15, 2022
2993669
Merge branch 'main' of github.com:galasa-dev/integratedtests
AaronJhaj Dec 20, 2022
d413fd7
Merge branch 'main' of github.com:galasa-dev/integratedtests
AaronJhaj Jan 18, 2023
e50af36
adding gradle.properties to fix compilation test deffect
AaronJhaj Jan 18, 2023
3bfc1a0
Updating GitHubIssue annotations (#171)
jadecarino Feb 9, 2023
ae37108
Remove Docker integrated tests (#174)
jadecarino Feb 27, 2023
eb6b0bc
uplift dependency on galasa framework to 0.26.0 instead of 0,.25.0 (#…
techcobweb Feb 27, 2023
7a0c848
Add Docker inttests back to schedule now DSS cleared there should be …
jadecarino Mar 5, 2023
e700d68
Merge branch 'compilation-test' of github.com:galasa-dev/integratedte…
jadecarino Mar 6, 2023
9e145fa
Upgrade inttests version to 0.26.0
jadecarino Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions galasa-inttests-parent/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ subprojects {

dependencies {
compileOnly 'dev.galasa:dev.galasa:0.21.0'
compileOnly 'dev.galasa:dev.galasa.framework:0.25.0'
compileOnly 'dev.galasa:dev.galasa.framework:0.26.0'
compileOnly 'dev.galasa:dev.galasa.core.manager:0.25.0'
compileOnly 'dev.galasa:dev.galasa.zos.manager:0.25.0'
compileOnly 'dev.galasa:dev.galasa.ipnetwork.manager:0.21.0'
compileOnly 'dev.galasa:dev.galasa.zos.manager:0.26.0'
compileOnly 'dev.galasa:dev.galasa.ipnetwork.manager:0.25.0'
compileOnly 'dev.galasa:dev.galasa.http.manager:0.25.0'
compileOnly 'dev.galasa:dev.galasa.artifact.manager:0.25.0'
compileOnly 'dev.galasa:dev.galasa.linux.manager:0.21.0'
compileOnly 'dev.galasa:dev.galasa.windows.manager:0.21.0'
compileOnly 'dev.galasa:dev.galasa.openstack.manager:0.25.0'
compileOnly 'dev.galasa:dev.galasa.openstack.manager:0.26.0'
compileOnly 'dev.galasa:dev.galasa.kubernetes.manager:0.25.0'
compileOnly 'dev.galasa:dev.galasa.docker.manager:0.25.0'
compileOnly 'dev.galasa:dev.galasa.galasaecosystem.manager:0.25.0'
Expand All @@ -104,7 +104,7 @@ subprojects {
compileOnly 'dev.galasa:dev.galasa.java.windows.manager:0.21.0'
compileOnly 'dev.galasa:dev.galasa.sem.manager:0.25.0'
compileOnly 'dev.galasa:dev.galasa.cicsts.manager:0.25.0'
compileOnly 'dev.galasa:dev.galasa.zosprogram.manager:0.21.0'
compileOnly 'dev.galasa:dev.galasa.zosprogram.manager:0.25.0'
compileOnly 'dev.galasa:dev.galasa.githubissue.manager:0.25.0'
compileOnly 'commons-logging:commons-logging:1.2'
compileOnly 'org.assertj:assertj-core:3.11.0'
Expand Down
4 changes: 2 additions & 2 deletions galasa-inttests-parent/dev.galasa.inttests.obr/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>dev.galasa</groupId>
<artifactId>dev.galasa.inttests.obr</artifactId>
<version>0.25.0</version>
<version>0.26.0</version>
<packaging>galasa-obr</packaging>

<properties>
Expand All @@ -25,7 +25,7 @@
<dependency>
<groupId>dev.galasa</groupId>
<artifactId>dev.galasa.inttests</artifactId>
<version>0.25.0</version>
<version>0.26.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion galasa-inttests-parent/dev.galasa.inttests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {

description = 'Galasa Integration Tests'

version = '0.25.0'
version = '0.26.0'

dependencies {
implementation 'com.google.code.gson:gson:2.8.5'
Expand Down
12 changes: 12 additions & 0 deletions ...rc/main/java/dev/galasa/inttests/compilation/simbank/AbstractCompilationLocalSimBank.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ private Path setupSimPlatform() throws ResourceUnavailableException, IOException
refactorSimplatform(simplatformParent);

outputFiles("simplatform-refactored", simplatformParent, false);


makeGradleProperties();
Copy link
Contributor

@jadecarino jadecarino Mar 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think what this test is doing, is taking files that already exist in the Simplatform repository on Github and putting them in a new file structure for a test to use. As the gradle.properties file you are trying to create does not exist in Github, you will have to create it then allow it to be copied over like the other folders are. Similar to what is happening on line 53.

  • Remove this method and call a method on like 54 called 'createParentGradleProperties(simplatformParent)' and implement this method doing a similar thing to what createParentSettings does, but for your gradle.properties file.



return simplatformParent;
}
Expand Down Expand Up @@ -199,5 +203,13 @@ private void changePrefix(Path file) throws IOException {
Files.write(file, fileData.getBytes());
logger.trace("Changing prefix (" + incumbent + ") to \"" + prefix + "\" in file: " + file.toString());
}

private void makeGradleProperties() throws IOException{
String gradleProperties = "gradle.properties";
String obr = "sourceMaven=https://development.galasa.dev/main/maven-repo/obr/";
Path gradlePropertiesFile = testRunDirectory.resolve("/.gradle/" + gradleProperties);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move this same logic into a different method called createParentGradleProperties as mentioned in my last comment.

Files.write(gradlePropertiesFile, obr.getBytes());

}

}
2 changes: 2 additions & 0 deletions ...v.galasa.inttests/src/main/java/dev/galasa/inttests/docker/AbstractDockerUbuntuLocal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
import dev.galasa.ResultArchiveStoreContentType;
import dev.galasa.SetContentType;
import dev.galasa.core.manager.StoredArtifactRoot;
import dev.galasa.githubissue.GitHubIssue;

@GitHubIssue( issue = "1366" )
public abstract class AbstractDockerUbuntuLocal extends AbstractDocker {

@StoredArtifactRoot
Expand Down
1 change: 0 additions & 1 deletion ....galasa.inttests/src/main/java/dev/galasa/inttests/zosBatch/AbstractZosBatchLocalRSE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
public abstract class AbstractZosBatchLocalRSE {

@Test
@GitHubIssue( issue = "1060" )
public void testZosBatchIvtTestRSE() throws Exception {

//Use RSE batch
Expand Down
1 change: 0 additions & 1 deletion ...ev.galasa.inttests/src/main/java/dev/galasa/inttests/zosFile/AbstractZosFileLocalRSE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public abstract class AbstractZosFileLocalRSE {


@Test
@GitHubIssue( issue = "1060" )
public void testZosFileIvtTestRSE() throws Exception {
getEcosystem().setCpsProperty("zos.bundle.extra.file.manager", "dev.galasa.zosfile.rseapi.manager");

Expand Down
1 change: 0 additions & 1 deletion ...ests/src/main/java/dev/galasa/inttests/zosFileDataset/AbstractZosFileDatasetLocalRSE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
public abstract class AbstractZosFileDatasetLocalRSE {

@Test
@GitHubIssue( issue = "1060" )
public void testZosFileIvtTestRSE() throws Exception {
getEcosystem().setCpsProperty("zos.bundle.extra.file.manager", "dev.galasa.zosfile.rseapi.manager");

Expand Down
1 change: 0 additions & 1 deletion ...ev.galasa.inttests/src/main/java/dev/galasa/inttests/zosVSAM/AbstractZosVSAMLocalRSE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
public abstract class AbstractZosVSAMLocalRSE {

@Test
@GitHubIssue( issue = "1060" )
public void testZosFileIvtTestRSE() throws Exception {
getEcosystem().setCpsProperty("zos.bundle.extra.file.manager", "dev.galasa.zosfile.rseapi.manager");

Expand Down