From 4855f5dc22dd688a19411620ce9c133d239c18b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E6=8C=AF=E5=AE=87?= <>
Date: Tue, 4 Feb 2025 15:25:40 +0800
Subject: [PATCH] refactor(executeFreeleapsPipeline): simplify error handling
 in generateComponentStages function and log Node.js version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 孙振宇 <>
---
 .../vars/executeFreeleapsPipeline.groovy      | 39 ++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
index 4e4af0e0..a459d869 100644
--- a/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
+++ b/first-class-pipeline/vars/executeFreeleapsPipeline.groovy
@@ -49,31 +49,26 @@ def generateComponentStages(component, configurations) {
       ) {
         node("dep-resolver-${component.name}") {
           script {
-            catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-              if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
-                log.info("Pipeline", "Using ${env.buildAgentImage} as build agent image for dependencies resolving")
-                def sourceFetcher = new SourceFetcher(this)
-                sourceFetcher.fetch(configurations)
+            if (env.executeMode == "fully" || env.changedComponents.contains(component.name)) {
+              log.info("Pipeline", "Using ${env.buildAgentImage} as build agent image for dependencies resolving")
+              def sourceFetcher = new SourceFetcher(this)
+              sourceFetcher.fetch(configurations)
 
-                def language = ServiceLanguage.parse(component.language)
-                def depManager = DependenciesManager.parse(component.dependenciesManager)
+              def language = ServiceLanguage.parse(component.language)
+              def depManager = DependenciesManager.parse(component.dependenciesManager)
 
-                def dependenciesResolver = new DependenciesResolver(this, language, env.workspace + "/" + component.root + "/")
-                dependenciesResolver.useManager(depManager)
-                
-                if (component.buildCacheEnabled) {
-                    dependenciesResolver.enableCachingSupport()
-                } else {
-                    dependenciesResolver.disableCachingSupport()
-                }
-
-                sh """
-                  echo "Running dependencies resolver inside the container"
-                  ${env.workspace}/dependenciesResolver.resolve(${component.name})
-                """
-
-                // dependenciesResolver.resolve(component)
+              def dependenciesResolver = new DependenciesResolver(this, language, env.workspace + "/" + component.root + "/")
+              dependenciesResolver.useManager(depManager)
+              
+              if (component.buildCacheEnabled) {
+                  dependenciesResolver.enableCachingSupport()
+              } else {
+                  dependenciesResolver.disableCachingSupport()
               }
+              
+              sh "node -v"
+
+              dependenciesResolver.resolve(component)
             }
           }
         }