Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Exclude test tasks from report aggregation step and fix setups not provisioning for pipeline deployments (#2697)

Koen30db082311d4
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
index f55a9280d..4328117d8 100644
--- a/.github/workflows/ci_cd.yml
+++ b/.github/workflows/ci_cd.yml
@@ -744,7 +744,7 @@ jobs:
id: backend-test-reports
run: |
if [ "$IS_MAIN" = "true" ]; then
- ./gradlew unitTestReport combinedCoverageReport
+ ./gradlew unitTestReport combinedCoverageReport -x test
echo "coverage=build/reports/jacoco/combinedCoverageReport/html" >> $GITHUB_OUTPUT
else
echo "coverage=test/build/reports/jacoco/test/html" >> $GITHUB_OUTPUT
diff --git a/build.gradle b/build.gradle
index f3e6cca5a..f2a8bb368 100644
--- a/build.gradle
+++ b/build.gradle
@@ -114,12 +114,12 @@ tasks.register('checkCoverageDataExists') {
mustRunAfter(getBackendProjects().collect { "${it.path}:test" })
doLast {
def testTasks = getActiveTestTasks()
- def hasFiles = testTasks.any {
+ def allJacocoResultsExist = testTasks.every {
it.extensions.findByType(JacocoTaskExtension)?.destinationFile?.exists()
}
// Check if any of the configured execution data files exist on disk
- if (!hasFiles) {
- println "Please run the following task to be able to generate a report."
+ if (!allJacocoResultsExist) {
+ println "Please run the following tasks to be able to generate a report."
println "Required tasks: ${testTasks.collect { it.path }.join(', ')}"
println "Run: gradle test -x npmTest checkCoverageDataExists"
throw new StopExecutionException()
diff --git a/ui/app/manager/build.gradle b/ui/app/manager/build.gradle
index ea6a31e4b..8ca2084ce 100644
--- a/ui/app/manager/build.gradle
+++ b/ui/app/manager/build.gradle
@@ -76,12 +76,12 @@ tasks.register('npmBuild', Exec) {
}
tasks.register('npmTest', Exec) {
- dependsOn getYarnInstallTask(), resolveTask(":clean")
+ dependsOn getYarnInstallTask(), resolveTask(":ui:test:clean")
commandLine npmCommand("yarn"), "run", "test"
}
tasks.register('npmTestUI', Exec) {
- dependsOn getYarnInstallTask(), resolveTask(":clean")
+ dependsOn getYarnInstallTask(), resolveTask(":ui:test:clean")
commandLine npmCommand("yarn"), "run", "test", "--ui"
}
diff --git a/ui/app/storybook/build.gradle b/ui/app/storybook/build.gradle
index 4aa14565d..3084b60b4 100644
--- a/ui/app/storybook/build.gradle
+++ b/ui/app/storybook/build.gradle
@@ -77,12 +77,12 @@ tasks.register('npmBuild', Exec) {
}
tasks.register('npmTest', Exec) {
- dependsOn getYarnInstallTask(), resolveTask(":clean")
+ dependsOn getYarnInstallTask(), resolveTask(":ui:test:clean")
commandLine npmCommand("yarn"), "run", "test"
}
tasks.register('npmTestUI', Exec) {
- dependsOn getYarnInstallTask(), resolveTask(":clean")
+ dependsOn getYarnInstallTask(), resolveTask(":ui:test:clean")
commandLine npmCommand("yarn"), "run", "test", "--ui"
}
diff --git a/ui/test/build.gradle b/ui/test/build.gradle
new file mode 100644
index 000000000..5766041b7
--- /dev/null
+++ b/ui/test/build.gradle
@@ -0,0 +1,3 @@
+tasks.register("clean", Delete) {
+ delete "tmp"
+}
diff --git a/ui/test/manager.cjs b/ui/test/manager.cjs
index dbd67a06d..e74f9b9b1 100755
--- a/ui/test/manager.cjs
+++ b/ui/test/manager.cjs
@@ -8,7 +8,7 @@ const os = require("node:os");
process.chdir(path.resolve(__dirname, "../.."));
// --- Default Environment Variables ---
-process.env.OR_STORAGE_DIR = process.env.OR_STORAGE_DIR || "tmp"; // Changed to relative local directory
+process.env.OR_STORAGE_DIR = process.env.OR_STORAGE_DIR || "ui/test/tmp"; // Changed to relative local directory
process.env.OR_APP_DOCROOT = process.env.OR_APP_DOCROOT || "manager/build/install/manager/web";
// Variables without defaults
process.env.OR_LOGGING_CONFIG_FILE = process.env.OR_LOGGING_CONFIG_FILE || path.join("ui", "test", "logging.properties");