Skip to content

Commit

Permalink
Merge pull request #3187 from Opetushallitus/ci-tests-cleanup
Browse files Browse the repository at this point in the history
TOR-2245 CI testiajojen siivousta
  • Loading branch information
a544jh authored Nov 4, 2024
2 parents 3465436 + 0a47cd7 commit 8e74799
Show file tree
Hide file tree
Showing 24 changed files with 98 additions and 1,895 deletions.
2 changes: 1 addition & 1 deletion .github/actions/koski_frontend_test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ runs:
with:
max_attempts: 2
timeout_minutes: 45
command: mvn scalatest:test -Pmocharunner -Dsuites="fi.oph.koski.mocha.KoskiParallelMochaSpec" --batch-mode
command: mvn scalatest:test -Dsuites="fi.oph.koski.mocha.KoskiParallelMochaSpec" --batch-mode

- name: Archive test screenshots
if: ${{ failure() }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/omadataoauth2_e2e_test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ runs:
PLAYWRIGHT_SHARD_INDEX: ${{inputs.shardIndex}}
PLAYWRIGHT_SHARD_TOTAL: ${{inputs.shardTotal}}
PLAYWRIGHT_HTML_REPORT: omadataoauth2-e2e-report-${{inputs.shardIndex}}-of-${{inputs.shardTotal}}
run: mvn scalatest:test -Pomadataoauth2e2e --batch-mode
run: mvn scalatest:test -DwildcardSuites="fi.oph.koski.omadataoauth2.e2e" --batch-mode
shell: bash
- uses: actions/upload-artifact@v3
if: always()
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/all_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ jobs:
with:
suites: |
fi.oph.koski.api.misc, \
fi.oph.koski.browserstack, \
fi.oph.koski.cache
run_backend_tests_nonmock:
Expand All @@ -145,17 +144,14 @@ jobs:
- uses: ./.github/actions/koski_backend_test
with:
suites: |
fi.oph.koski.browserstack, \
fi.oph.koski.cache, \
fi.oph.koski.editor, \
fi.oph.koski.environment, \
fi.oph.koski.etk, \
fi.oph.koski.hakemuspalvelu, \
fi.oph.koski.henkilo, \
fi.oph.koski.http, \
fi.oph.koski.integrationtest, \
fi.oph.koski.cas, \
fi.oph.koski.casintegration, \
fi.oph.koski.json, \
fi.oph.koski.kela, \
fi.oph.koski.koodisto, \
Expand All @@ -165,7 +161,6 @@ jobs:
fi.oph.koski.luovutuspalvelu, \
fi.oph.koski.migration, \
fi.oph.koski.migri, \
fi.oph.koski.mocha, \
fi.oph.koski.mydata, \
fi.oph.koski.omaopintopolkuloki, \
fi.oph.koski.opiskeluoikeus, \
Expand Down
33 changes: 14 additions & 19 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,9 @@ prettier-format-mock-data:

### Running tests


.PHONY: browserstack
browserstack:
mvn $(mvn_opts) -DargLine="$(mvn_argline)" test -Pbrowserstack

.PHONY: localizationtest
localizationtest:
mvn $(mvn_opts) -DargLine="$(mvn_argline)" test -Plocalization
mvn $(mvn_opts) -DargLine="$(mvn_argline)" test -DwildcardSuites="fi.oph.koski.inenvironmentlocalization"

.PHONY: testresults
testresults:
Expand All @@ -86,11 +81,11 @@ js-unit-test-watch:

.PHONY: backtest
backtest:
mvn $(mvn_opts) -DargLine="$(mvn_argline)" test -DmembersOnlySuites="fi.oph.koski.browserstack,\
mvn $(mvn_opts) -DargLine="$(mvn_argline)" test -DwildcardSuites="\
fi.oph.koski.cache,fi.oph.koski.editor,fi.oph.koski.environment,\
fi.oph.koski.etk,fi.oph.koski.hakemuspalvelu,fi.oph.koski.henkilo,fi.oph.koski.http,\
fi.oph.koski.integrationtest,fi.oph.koski.json,fi.oph.koski.kela,fi.oph.koski.koodisto,\
fi.oph.koski.koskiuser,fi.oph.koski.localization,fi.oph.koski.cas,fi.oph.koski.casintegration,fi.oph.koski.log,\
fi.oph.koski.koskiuser,fi.oph.koski.localization,fi.oph.koski.cas,fi.oph.koski.log,\
fi.oph.koski.luovutuspalvelu,fi.oph.koski.migration,fi.oph.koski.migri,\
fi.oph.koski.mocha,fi.oph.koski.mydata,fi.oph.koski.omaopintopolkuloki,\
fi.oph.koski.opiskeluoikeus,fi.oph.koski.oppilaitos,fi.oph.koski.oppivelvollisuustieto,\
Expand All @@ -100,25 +95,25 @@ backtest:
fi.oph.koski.userdirectory,fi.oph.koski.util,fi.oph.koski.valpas,\
fi.oph.koski.valvira,fi.oph.koski.versioning,fi.oph.koski.virta,fi.oph.koski.vkt,\
fi.oph.koski.ytl,fi.oph.koski.ytr,fi.oph.koski.ytl,fi.oph.koski.meta,\
fi.oph.koski.ytl,fi.oph.koski.api,fi.oph.koski.frontendvalvonta,fi.oph.koski.tiedonsiirto\
fi.oph.koski.ytl,fi.oph.koski.api,fi.oph.koski.frontendvalvonta,fi.oph.koski.tiedonsiirto,\
fi.oph.koski.typemodel,fi.oph.koski.suoritusjako,fi.oph.koski.suoritusjako.suoritetuttutkinnot,\
fi.oph.koski.massaluovutus,fi.oph.koski.omadataoauth2.unit,fi.oph.koski.omadataoauth2.e2e"

.PHONY: backtestnonmock
backtestnonmock:
mvn $(mvn_opts) -DargLine="$(mvn_argline)" test -DmembersOnlySuites="fi.oph.koski.nonmockloginsecurity"
mvn $(mvn_opts) -DargLine="$(mvn_argline)" test -DwildcardSuites="fi.oph.koski.nonmockloginsecurity"

.PHONY: fronttest
fronttest:
mvn $(mvn_opts) -DargLine="$(mvn_argline)" test -Pfronttest
mvn $(mvn_opts) -DargLine="$(mvn_argline)" test -DwildcardSuites="fi.oph.koski.mocha" -DtagsToExlude="parallelmocha"

.PHONY: integrationtest
integrationtest:
mvn $(mvn_opts) -DargLine="$(mvn_argline)" test -Pintegrationtest -Dsuites="fi.oph.koski.e2e.KoskiFrontSpec"
mvn $(mvn_opts) -DargLine="$(mvn_argline)" test -Dsuites="fi.oph.koski.e2e.KoskiFrontSpec"

.PHONY: omadataoauth2e2e
omadataoauth2e2e:
mvn $(mvn_opts) -DargLine="$(mvn_argline)" test -Pomadataoauth2e2e -Dsuites="fi.oph.koski.omadataoauth2.e2e.OmaDataOAuth2E2ESpec"
mvn $(mvn_opts) -DargLine="$(mvn_argline)" test -Dsuites="fi.oph.koski.omadataoauth2.e2e.OmaDataOAuth2E2ESpec"

.PHONY: screenshot
screenshot:
Expand Down Expand Up @@ -203,27 +198,27 @@ install-and-verify-valpas-jest-deps:

.PHONY: valpas-fronttest-1
valpas-fronttest-1:
mvn $(mvn_opts) -DargLine="$(mvn_argline)" scalatest:test -Pvalpasfronttest -Dsuites="fi.oph.koski.valpas.jest.ValpasFrontSpec1" --batch-mode
mvn $(mvn_opts) -DargLine="$(mvn_argline)" scalatest:test -Dsuites="fi.oph.koski.frontendvalpas.jest.ValpasFrontSpec1" --batch-mode

.PHONY: valpas-fronttest-2
valpas-fronttest-2:
mvn $(mvn_opts) -DargLine="$(mvn_argline)" scalatest:test -Pvalpasfronttest -Dsuites="fi.oph.koski.valpas.jest.ValpasFrontSpec2" --batch-mode
mvn $(mvn_opts) -DargLine="$(mvn_argline)" scalatest:test -Dsuites="fi.oph.koski.frontendvalpas.jest.ValpasFrontSpec2" --batch-mode

.PHONY: valpas-fronttest-3
valpas-fronttest-3:
mvn $(mvn_opts) -DargLine="$(mvn_argline)" scalatest:test -Pvalpasfronttest -Dsuites="fi.oph.koski.valpas.jest.ValpasFrontSpec3" --batch-mode
mvn $(mvn_opts) -DargLine="$(mvn_argline)" scalatest:test -Dsuites="fi.oph.koski.frontendvalpas.jest.ValpasFrontSpec3" --batch-mode

.PHONY: valpas-fronttest-4
valpas-fronttest-4:
mvn $(mvn_opts) -DargLine="$(mvn_argline)" scalatest:test -Pvalpasfronttest -Dsuites="fi.oph.koski.valpas.jest.ValpasFrontSpec4" --batch-mode
mvn $(mvn_opts) -DargLine="$(mvn_argline)" scalatest:test -Dsuites="fi.oph.koski.frontendvalpas.jest.ValpasFrontSpec4" --batch-mode

.PHONY: valpas-fronttest-5
valpas-fronttest-5:
mvn $(mvn_opts) -DargLine="$(mvn_argline)" scalatest:test -Pvalpasfronttest -Dsuites="fi.oph.koski.valpas.jest.ValpasFrontSpec5" --batch-mode
mvn $(mvn_opts) -DargLine="$(mvn_argline)" scalatest:test -Dsuites="fi.oph.koski.frontendvalpas.jest.ValpasFrontSpec5" --batch-mode

.PHONY: valpas-fronttest-6
valpas-fronttest-6:
mvn $(mvn_opts) -DargLine="$(mvn_argline)" scalatest:test -Pvalpasfronttest -Dsuites="fi.oph.koski.valpas.jest.ValpasFrontSpec6" --batch-mode
mvn $(mvn_opts) -DargLine="$(mvn_argline)" scalatest:test -Dsuites="fi.oph.koski.frontendvalpas.jest.ValpasFrontSpec6" --batch-mode


### Dist
Expand Down
133 changes: 0 additions & 133 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -629,128 +629,6 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<configuration>
<tagsToExclude>
koskidev,browserstack,localization,mocha,parallelmocha,valpasfront,casintegration,integrationtest,omadataoauth2e2e</tagsToExclude>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>koskidev</id>
<build>
<plugins>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<configuration>
<wildcardSuites>fi.oph.koski.integrationtest</wildcardSuites>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>localization</id>
<build>
<plugins>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<configuration>
<wildcardSuites>fi.oph.koski.localization</wildcardSuites>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>casintegration</id>
<build>
<plugins>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<configuration>
<wildcardSuites>fi.oph.koski.casintegration</wildcardSuites>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>browserstack</id>
<build>
<plugins>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<configuration>
<wildcardSuites>fi.oph.koski.browserstack</wildcardSuites>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>mocharunner</id>
<build>
<plugins>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>fronttest</id>
<build>
<plugins>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<configuration>
<wildcardSuites>fi.oph.koski.mocha</wildcardSuites>
<tagsToExclude>parallelmocha,valpasfront</tagsToExclude>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>integrationtest</id>
<build>
<plugins>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<configuration>
<wildcardSuites>fi.oph.koski.e2e</wildcardSuites>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>omadataoauth2e2e</id>
<build>
<plugins>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<configuration>
<wildcardSuites>fi.oph.koski.omadataoauth2.e2e</wildcardSuites>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>coverage</id>
Expand Down Expand Up @@ -834,17 +712,6 @@
</plugins>
</build>
</profile>
<profile>
<id>valpasfronttest</id>
<build>
<plugins>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<distributionManagement>
<repository>
Expand Down
Loading

0 comments on commit 8e74799

Please sign in to comment.