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

[BRMO-287][BRMO-288] Verouderde P8 testcases en procedures opruimen #1720

Merged
merged 2 commits into from
Feb 16, 2023
Merged

[BRMO-287][BRMO-288] Verouderde P8 testcases en procedures opruimen #1720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9decfa
[BRMO-288] Opruimen verouderde P8 testcases
mprins Feb 16, 2023
40a3507
[BRMO-287] Opruimen P8 Jenkins CI stappen
mprins Feb 16, 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
2 changes: 1 addition & 1 deletion .github/workflows/linux-oracle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
run: |
mvn -e verify -B -Poracle -T1 -Dtest.onlyITs=true -pl 'bag2-loader' -DskipQA=true
.build/ci/oracle-setup-bag2_views.sh
mvn resources:testResources compiler:testCompile surefire:test -Poracle -pl datamodel -Dtest='!*UpgradeTest,!P8*' -DskipQA=true
mvn resources:testResources compiler:testCompile surefire:test -Poracle -pl datamodel -Dtest='!*UpgradeTest' -DskipQA=true

- name: 'Verify bgt-loader'
run: mvn -e verify -B -Poracle -T1 -Dtest.onlyITs=true -pl 'bgt-loader' -DskipQA=true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
run: |
mvn -e verify -B -Ppostgresql -T1 -Dtest.onlyITs=true -pl 'bag2-loader' -DskipQA=true
.build/ci/pgsql-setup-bag2_views.sh
mvn resources:testResources compiler:testCompile surefire:test -Ppostgresql -pl datamodel -Dtest='!*UpgradeTest,!P8*' -DskipQA=true
mvn resources:testResources compiler:testCompile surefire:test -Ppostgresql -pl datamodel -Dtest='!*UpgradeTest' -DskipQA=true

- name: 'Verify bgt-loader'
run: mvn -e verify -B -Ppostgresql -T1 -Dtest.onlyITs=true -pl 'bgt-loader' -DskipQA=true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: 'Test'
run: |
mvn --% -e test -B -pl "!brmo-dist" -Dtest.onlyITs=false -DskipQA=true
mvn --% resources:testResources compiler:testCompile surefire:test -pl datamodel -Dtest="!*UpgradeTest,!P8*" -DskipQA=true
mvn --% resources:testResources compiler:testCompile surefire:test -pl datamodel -Dtest="!*UpgradeTest" -DskipQA=true

- name: 'Verify'
# no database integration tests; GH does not support linux containers on windows and
Expand Down
18 changes: 1 addition & 17 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ timestamps {
}

stage("datamodel tests"){
sh "mvn -e -B -Poracle -pl 'datamodel' resources:testResources compiler:testCompile surefire:test -Dtest='!*UpgradeTest,!P8*',!*ViewsTest"
sh "mvn -e -B -Poracle -pl 'datamodel' resources:testResources compiler:testCompile surefire:test -Dtest='!*UpgradeTest',!*ViewsTest"
}

stage("bgt-loader Integration Test") {
Expand Down Expand Up @@ -148,22 +148,6 @@ timestamps {
sh "sqlplus -l -S jenkins_bag/jenkins_bag@192.168.1.26:15210/XE < ./.jenkins/clear-schema.sql"
sh "sqlplus -l -S jenkins_brk/jenkins_brk@192.168.1.26:15210/XE < ./.jenkins/clear-schema.sql"
}

configFileProvider([
configFile(
fileId: 'local.P8.properties',
targetLocation: 'datamodel/src/test/resources/local.P8.properties'
)
]) {
lock('rsgb-p8') {
stage("P8 datamodel Integration Test") {
sh "mvn -Pp8 process-test-resources -pl 'datamodel'"
sh "./datamodel/target/pgsql-reinstall-rsgb-views.sh"
sh "mvn -e verify -B -Pp8 -T1 -pl 'datamodel' -fae"
}
}
}
/* sh "docker stop oracle-brmo" */
}
}
}
Expand Down
84 changes: 0 additions & 84 deletions datamodel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,89 +466,5 @@
</plugins>
</build>
</profile>
<profile>
<id>p8</id>
<build>
<defaultGoal>verify</defaultGoal>
<testResources>
<testResource>
<targetPath>${project.build.directory}/</targetPath>
<filtering>true</filtering>
<directory>${maven.multiModuleProjectDirectory}/.build/ci/</directory>
<includes>
<include>pgsql-reinstall-rsgb-views.sh</include>
</includes>
</testResource>
<testResource>
<directory>${project.basedir}/src/test/resources</directory>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<configuration>
<properties />
<outputFile />
<quiet>true</quiet>
<files>
<file>${project.basedir}/src/test/resources/P8.properties</file>
<file>${project.basedir}/src/test/resources/local.P8.properties</file>
</files>
<quiet>true</quiet>
</configuration>
<executions>
<execution>
<id>initialize</id>
<goals>
<goal>read-project-properties</goal>
</goals>
<phase>initialize</phase>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>process-test-resources</id>
<goals>
<goal>run</goal>
</goals>
<phase>process-test-resources</phase>
<configuration>
<target>
<chmod file="${project.build.directory}/pgsql-reinstall-rsgb-views.sh" perm="ugo+x" />
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<trimStackTrace>false</trimStackTrace>
<useFile>false</useFile>
<includes>
<include>**/*IntegrationTest.java</include>
</includes>
<systemPropertyVariables />
<trimStackTrace>false</trimStackTrace>
<useFile>false</useFile>
<!-- <skipTests>!${test.onlyITs}</skipTests>-->
<!-- <skipITs>!${test.onlyITs}</skipITs>-->
<argLine>${failsafeArgLine}</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
93 changes: 0 additions & 93 deletions datamodel/src/test/java/nl/b3p/brmo/datamodel/P8RestAPIIntegrationTest.java
View file
Open in desktop

This file was deleted.

Loading