Fix cross_repo for node_js repositories

NodeJS repositories were running bin/setup plus npm install which was causing failures.
ManageIQ · Apr 26, 2024 · a229878 · a229878
1 parent f108722
commit a229878
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/manageiq/cross_repo/runner/base.rb b/lib/manageiq/cross_repo/runner/base.rb
@@ -83,8 +83,8 @@ def defaults
           "node_js" => {
             "language" => "node_js",
             "node_js"  => ["18"],
-            "install"  => "npm install",
-            "script"   => "npm test"
+            "install"  => "yarn",
+            "script"   => "yarn run test"
           },
           "ruby"    => {
             "language" => "ruby",

diff --git a/lib/manageiq/cross_repo/runner/github.rb b/lib/manageiq/cross_repo/runner/github.rb
@@ -24,7 +24,7 @@ def ci_config
         result = {"language" => language}
 
         result["before_install"] = steps_by_name["Set up system"]["run"] if steps_by_name["Set up system"]
-        result["before_script"]  = steps_by_name["Prepare tests"]["run"] if steps_by_name["Prepare tests"]
+        result["install"]        = steps_by_name["Prepare tests"]["run"] if steps_by_name["Prepare tests"]
         result["script"]         = steps_by_name["Run tests"]["run"]     if steps_by_name["Run tests"]
 
         result