fix: correct packages to test suite map

Signed-off-by: Saw-jan <[email protected]>

Author: saw-jan

.drone.star

@@ -723,7 +723,7 @@ def e2eTests(ctx):
                      "environment": environment,
                      "commands": [
                          "cat %s/tests/drone/suites.env" % dir["web"],
-                         "source %s/tests/drone/suites.env || true" % dir["web"],
+                         ". %s/tests/drone/suites.env || true" % dir["web"],
                          "cd tests/e2e",
                          "echo $TEST_SUITES",
                          "echo $FEATURE_FILES",

tests/drone/filterTestSuitesToRun.js

@@ -7,14 +7,17 @@ const targetBranch = process.env.DRONE_TARGET_BRANCH || 'master'
 // INFO: 1 and 2 elements are node and script name respectively
 const scriptDir = path.dirname(process.argv[1])
 const suitesToCheck = process.argv[2]
+  .split(',')
+  .map((suite) => suite.trim())
+  .filter((suite) => suite)
 
 // list of test suites with dependent packages
 // Example:
 // {
 //   'ocm': ['web-app-ocm'],
 //   'search': ['web-app-search']
 // }
-const testSuiteToPackageMap = {}
+const packageToTestSuiteMap = {}
 
 /*
 --------------------
@@ -49,11 +52,21 @@ const testSuites = fs.readdirSync(testSuitesDir).filter((entry) => {
     const content = fs.readFileSync(webPackagesFile, 'utf-8')
     const depPackages = content.split('\n').filter((line) => line && line.startsWith('web-'))
     if (depPackages.length) {
-      testSuiteToPackageMap[entry] = [...new Set([...depPackages, ...defaultPackages])]
+      depPackages.forEach((pkg) => {
+        if (!(pkg in packageToTestSuiteMap)) {
+          packageToTestSuiteMap[pkg] = []
+        }
+        !packageToTestSuiteMap[pkg].includes(entry) && packageToTestSuiteMap[pkg].push(entry)
+      })
       return true
     }
   }
-  testSuiteToPackageMap[entry] = allWebPackages
+  allWebPackages.forEach((pkg) => {
+    if (!(pkg in packageToTestSuiteMap)) {
+      packageToTestSuiteMap[pkg] = []
+    }
+    !packageToTestSuiteMap[pkg].includes(entry) && packageToTestSuiteMap[pkg].push(entry)
+  })
   return true
 })
 
@@ -67,7 +80,7 @@ function getPackageFromFile(file) {
   if (!file.startsWith('packages/')) {
     return
   }
-  const packages = Object.keys(pacToTests)
+  const packages = Object.keys(packageToTestSuiteMap)
   for (const pkg of packages) {
     if (file.startsWith(`packages/${pkg}`)) {
       return pkg
@@ -89,14 +102,16 @@ function getAffectedTestSuites(changedFiles) {
     //   return testSuites
     // }
     const packageName = getPackageFromFile(file)
-    if (packageName && packageName in pacToTests) {
-      pacToTests[packageName].forEach((suite) => affectedSuites.add(suite))
+    if (packageName && packageName in packageToTestSuiteMap) {
+      packageToTestSuiteMap[packageName].forEach((suite) => affectedSuites.add(suite))
     }
   }
   return Array.from(affectedSuites)
 }
 
 function createSuitesToRunEnvFile(suites = []) {
+  console.log('[INFO] Provided test suites/scenarios:\n  - ' + suitesToCheck.join('\n  - '))
+  console.log('[INFO] Test suites/scenarios to run:\n  - ' + suites.join('\n  - '))
   const envContent = ['TEST_SUITES', suites.join(',')]
   if (suites[0].startsWith('cucumber/')) {
     envContent[0] = ['FEATURE_FILES']
@@ -116,8 +131,8 @@ function main() {
     console.log('[INFO] No affected test suites to run.')
     process.exit(78) // Skip the pipeline
   }
-  if (suitesToCheck) {
-    const suitesToRun = suitesToCheck.split(',').filter((suite) => {
+  if (suitesToCheck.length) {
+    const suitesToRun = suitesToCheck.filter((suite) => {
       suite = suite.trim()
       if (suite.startsWith('cucumber/')) {
         suite = suite.replace('cucumber/features/', '').split('/').shift()
@@ -127,7 +142,7 @@ function main() {
     if (suitesToRun.length === 0) {
       console.log(
         '[INFO] The following test suites are not affected and will be skipped:',
-        suitesToCheck.split(',').join('\n')
+        suitesToCheck.join('\n')
       )
       process.exit(78) // Skip the pipeline
     }