Merge branch 'main' into minor-fix

OpenTOSCA · Sep 27, 2024 · 1722416 · 1722416
2 parents 5228092 + e524c64
commit 1722416
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/case-study-unfurl-technology.yaml b/.github/workflows/case-study-unfurl-technology.yaml
@@ -1,6 +1,9 @@
+# TODO: migrate this
+
 name: Case Study "Unfurl Technology"
 on:
     workflow_dispatch:
+
 concurrency: unfurl-technology
 jobs:
     ###################################################

diff --git a/.github/workflows/night.yaml b/.github/workflows/night.yaml
@@ -4,8 +4,6 @@
 # We dot not introduce one big "vintner-case-study" action due to better logging.defaults:
 # See https://github.com/orgs/community/discussions/21276
 
-# TODO: fix OpenStack problem when using xOpera
-
 name: Night
 on:
     workflow_dispatch:
@@ -14,6 +12,7 @@ on:
     push:
         branches:
             - fix-night-workflow
+
 concurrency: night
 jobs:
     ###################################################
@@ -216,7 +215,6 @@ jobs:
     xopera-motivation-prod:
         name: xOpera Motivation Prod
         runs-on: ubuntu-22.04
-        if: false
         env:
             ORCHESTRATOR: xopera
             EXAMPLE: xopera-motivation
@@ -615,7 +613,6 @@ jobs:
     xopera-pruning-mode-elastic:
         name: xOpera Pruning Mode "Consistent Loose" Elastic
         runs-on: ubuntu-22.04
-        if: false
         concurrency: xopera-pruning-elastic
         env:
             ORCHESTRATOR: xopera
@@ -679,6 +676,7 @@ jobs:
 
     # TODO: Disabled for now. Out of nowhere, github workflow cant deploy the application (works on my machine)
     unfurl-artifacts-community:
+        if: false
         name: Unfurl Artifacts Community
         runs-on: ubuntu-22.04
         if: false
@@ -812,6 +810,7 @@ jobs:
 
     # TODO: Disabled for now. Out of nowhere, github workflow cant deploy the application (works on my machine)
     unfurl-aware-local:
+        if: false
         name: Unfurl Aware Local
         runs-on: ubuntu-22.04
         if: false

diff --git a/src/controller/utils/scenarios.ts b/src/controller/utils/scenarios.ts
@@ -21,6 +21,13 @@ export type ScenariosOptions = {
 }
 
 export default async function (options: ScenariosOptions) {
+    /**
+     * Replace 'asterisk' with '*' due to parsing problems
+     */
+    options.hosting = check.isArray(options.hosting)
+        ? options.hosting.map(hosting => (hosting === 'asterisk' ? ASTERISK : hosting))
+        : options.hosting
+
     /**
      * Graph
      */
@@ -113,8 +120,11 @@ function matches(graph: Graph, input: string[], hosting: string[]): boolean {
     // Accept that user provided hosting is shorter than rule
     if (check.isUndefined(is)) return true
 
+    if (asterisk) return matches(graph, utils.copy(input), utils.copy(hosting))
+
     if (graph.inheritance.isNodeType(is, question)) {
         const hostingCopy = utils.copy(hosting)
+
         if (asterisk) hostingCopy.shift()
         hostingCopy.shift()
 
@@ -123,7 +133,5 @@ function matches(graph: Graph, input: string[], hosting: string[]): boolean {
         return matches(graph, utils.copy(input), hostingCopy)
     }
 
-    if (asterisk) return matches(graph, utils.copy(input), utils.copy(hosting))
-
     return false
 }
diff --git a/tests/utils.ts b/tests/utils.ts
@@ -56,7 +56,7 @@ export function runGroups(groups: VariabilityTestGroup[]) {
             const effectiveTests = onlyTests.length ? onlyTests : nonDisabledTests
 
             effectiveTests.forEach(test => {
-                it(test.name, getDefaultTest(test.dir, test.vstdir)).timeout(10 * 1000)
+                it(test.name, getDefaultTest(test.dir, test.vstdir)).timeout(20 * 1000)
             })
         })
     }