Jenkinsfile

@@ -28,7 +28,19 @@ pipeline {
 
         stage ('Compile & Test') {
             steps {
-                sh './gradlew clean check --no-daemon -x pitest -x dependencyCheckAnalyze'
+                sh './gradlew clean check --no-daemon -x pitest -x dependencyCheckAnalyze -x importOfficeData -x importHostingAssets'
+            }
+        }
+
+        stage ('Import-Tests') {
+            steps {
+                sh './gradlew importOfficeData importHostingAssets'
+            }
+        }
+
+        stage ('Scenario-Tests') {
+            steps {
+                sh './gradlew scenrioTests'
             }
         }
     }
@@ -47,7 +59,7 @@ pipeline {
 
             // archive scenario-test reports in HTML format
             sh '''
-                gw convertMarkdownToHtml
+                ./gradlew convertMarkdownToHtml
             '''
             archiveArtifacts artifacts: 'doc/scenarios/*.html', allowEmptyArchive: true
 

build.gradle

@@ -255,7 +255,7 @@ test {
             'net.hostsharing.hsadminng.**.generated.**',
     ]
     useJUnitPlatform {
-        excludeTags 'import'
+        excludeTags 'importOfficeData', 'importHostingData', 'scenarioTest'
     }
 }
 jacocoTestReport {
@@ -344,6 +344,17 @@ tasks.register('importHostingAssets', Test) {
     mustRunAfter spotlessJava
 }
 
+tasks.register('scenarioTests', Test) {
+    useJUnitPlatform {
+        includeTags 'scenarioTest'
+    }
+
+    group 'verification'
+    description 'run the import jobs as tests'
+
+    mustRunAfter spotlessJava
+}
+
 // pitest mutation testing
 pitest {
     targetClasses = ['net.hostsharing.hsadminng.**']